From 81c646fd9813d31d6b85319c659d77174c7725fd Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Thu, 21 Jan 2016 19:24:46 +0300 Subject: [PATCH 1/3] [ios] Fixed bug with wrong text color in download map request. --- .../CustomViews/MapViewControls/Search/MWMSearchManager.mm | 3 ++- .../CustomViews/MapViewControls/Search/MWMSearchView.mm | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm index 514ca51a1d..35972711fc 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm @@ -62,9 +62,10 @@ extern NSString * const kSearchStateKey = @"SearchStateKey"; - (void)refresh { [self.rootView refresh]; + if (self.state == MWMSearchManagerStateHidden) + return; [self.tabbedController refresh]; [self.tableViewController refresh]; - [self.downloadController refresh]; } - (void)beginSearch diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm index 931bdde71b..aa804d0a73 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm @@ -32,6 +32,12 @@ static CGFloat const kWidthForiPad = 320.0; sl.rasterizationScale = sbl.rasterizationScale = tbl.rasterizationScale = scale; } +- (void)refresh +{ + [self.searchBar refresh]; + [self.infoWrapper refresh]; +} + - (void)setFrame:(CGRect)frame { BOOL const equal = CGRectEqualToRect(super.frame, frame); From a0a31918cd08fbe98c46c2874f5c801b2a32e53e Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Fri, 22 Jan 2016 11:22:44 +0300 Subject: [PATCH 2/3] [ios] Fixed bug with wrong bookmark color cell's color in night mode. --- iphone/Maps/Classes/MWMBookmarkColorCell.mm | 7 +++++++ iphone/Maps/Classes/MWMBookmarkColorViewController.h | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/MWMBookmarkColorCell.mm b/iphone/Maps/Classes/MWMBookmarkColorCell.mm index 41d0f4fdad..0d48f0316c 100644 --- a/iphone/Maps/Classes/MWMBookmarkColorCell.mm +++ b/iphone/Maps/Classes/MWMBookmarkColorCell.mm @@ -1,4 +1,5 @@ #import "MWMBookmarkColorCell.h" +#import "UIColor+MapsMeColor.h" extern NSArray * const kBookmarkColorsVariant; @@ -10,6 +11,12 @@ extern NSArray * const kBookmarkColorsVariant; @implementation MWMBookmarkColorCell +- (void)awakeFromNib +{ + [super awakeFromNib]; + self.backgroundColor = [UIColor white]; +} + - (void)configureWithColorString:(NSString *)colorString { self.currentImageName = colorString; diff --git a/iphone/Maps/Classes/MWMBookmarkColorViewController.h b/iphone/Maps/Classes/MWMBookmarkColorViewController.h index 3b6d6fcfb8..7ef7939721 100644 --- a/iphone/Maps/Classes/MWMBookmarkColorViewController.h +++ b/iphone/Maps/Classes/MWMBookmarkColorViewController.h @@ -1,4 +1,3 @@ -#import #import "ViewController.h" @class MWMPlacePageViewManager; From fe21a5ddc01ad6704ba8a6730b06338e1bd1c3cc Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Fri, 22 Jan 2016 12:43:22 +0300 Subject: [PATCH 3/3] [ios] Fixed bug with iPad place page after rotate. --- iphone/Maps/Classes/MWMiPadPlacePage.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iphone/Maps/Classes/MWMiPadPlacePage.mm b/iphone/Maps/Classes/MWMiPadPlacePage.mm index 642193dd0e..d5456359f5 100644 --- a/iphone/Maps/Classes/MWMiPadPlacePage.mm +++ b/iphone/Maps/Classes/MWMiPadPlacePage.mm @@ -272,6 +272,8 @@ static CGFloat const kKeyboardOffset = 12.; - (void)updatePlacePageLayoutAnimated:(BOOL)animated { + if (![self.navigationController.topViewController isKindOfClass:[MWMiPadPlacePageViewController class]]) + return; [UIView animateWithDuration:animated ? kDefaultAnimationDuration : 0.0 animations:^ { CGFloat const ppHeight = self.basePlacePageView.height;