From ab568b42d56d932a6a62a32fd39069e89e68434b Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Fri, 22 Jul 2022 00:16:04 +0200
Subject: [PATCH] [ios] modify search result description to be multiline
Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
.../Search/TableView/MWMSearchCommonCell.mm | 31 ++++++--------
.../Search/TableView/MWMSearchCommonCell.xib | 41 +++----------------
2 files changed, 17 insertions(+), 55 deletions(-)
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
index 1bb5e6eeb4..8de9a68b91 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
@@ -20,9 +20,7 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
@property(weak, nonatomic) IBOutlet UILabel * distanceLabel;
@property(weak, nonatomic) IBOutlet UILabel * infoLabel;
@property(weak, nonatomic) IBOutlet UILabel * locationLabel;
-@property(weak, nonatomic) IBOutlet UILabel * typeLabel;
@property(weak, nonatomic) IBOutlet UILabel * openLabel;
-@property(weak, nonatomic) IBOutlet UIView * infoView;
@property(weak, nonatomic) IBOutlet UIView * popularView;
@end
@@ -35,8 +33,6 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
{
[super config:result localizedTypeName:localizedTypeName];
- self.typeLabel.text = localizedTypeName;
-
self.locationLabel.text = @(result.GetAddress().c_str());
[self.locationLabel sizeToFit];
@@ -47,22 +43,27 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
NSString * brand = @"";
if (!result.GetBrand().empty())
brand = @(platform::GetLocalizedBrandName(result.GetBrand()).c_str());
+
+ NSString * description = @"";
static NSString * fiveStars = [NSString stringWithUTF8String:"★★★★★"];
if (starsCount > 0)
- [self setInfoText:[fiveStars substringToIndex:starsCount]];
+ description = [fiveStars substringToIndex:starsCount];
else if (airportIata.length > 0)
- [self setInfoText:airportIata];
+ description = airportIata;
else if (roadShields.length > 0)
- [self setInfoText:roadShields];
+ description = roadShields;
else if (brand.length > 0 && cuisine.length > 0)
- [self setInfoText:[NSString stringWithFormat:@"%@ • %@", brand, cuisine]];
+ description = [NSString stringWithFormat:@"%@ • %@", brand, cuisine];
else if (brand.length > 0)
- [self setInfoText:brand];
+ description = brand;
else if (cuisine.length > 0)
- [self setInfoText:cuisine];
+ description = cuisine;
+
+ if ([description length] == 0)
+ self.infoLabel.text = localizedTypeName;
else
- [self clearInfo];
+ self.infoLabel.text = [NSString stringWithFormat:@"%@ • %@", localizedTypeName, description];
CLLocation * lastLocation = [MWMLocationManager lastLocation];
double distanceInMeters = 0.0;
@@ -130,14 +131,6 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
[self setStyleAndApply: @"Background"];
}
-- (void)setInfoText:(NSString *)infoText
-{
- self.infoView.hidden = NO;
- self.infoLabel.text = infoText;
-}
-
-- (void)clearInfo { self.infoView.hidden = YES; }
-
- (NSDictionary *)selectedTitleAttributes
{
return @{
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib
index 40ab2d09ad..559494e671 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib
@@ -71,7 +71,7 @@
-