gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed route button displaying

Browse source
This commit is contained in:
VladiMihaylenko 2015-03-17 14:59:33 +03:00 • committed by Alex Zolotarev
parent 6da048bcb7
commit ba9ae1788a
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/PlacePageView.h
View file

@ -38,6 +38,6 @@ typedef NS_ENUM(NSUInteger, PlacePageState) {
@property (nonatomic, readonly) NSString * temporaryTitle;
@property (nonatomic) BOOL statusBarIncluded;
- (void)showBuildingRoutingActivity:(BOOL)buiding;
- (void)showBuildingRoutingActivity:(BOOL)show;
@end

17
iphone/Maps/Classes/PlacePageView.mm
View file

@ -364,7 +364,11 @@ typedef NS_ENUM(NSUInteger, CellRow)
self.bookmarkButton.midY = 44;
}
self.routeButton.midY = self.bookmarkButton.midY - 1;
self.routeButton.hidden = [self isMyPosition];
if (self.routingActivity.isAnimating) {
self.routeButton.hidden = YES;
} else {
self.routeButton.hidden = [self isMyPosition];
}
}
- (CGFloat)headerHeight
@ -445,6 +449,9 @@ typedef NS_ENUM(NSUInteger, CellRow)
CGFloat const headerHeight = [self headerHeight];
self.tableView.frame = CGRectMake(0, headerHeight, self.superview.width, self.backgroundView.height - headerHeight);
}
if (self.routingActivity.isAnimating) {
self.routingActivity.center = CGPointMake(self.routeButton.midX, self.routeButton.midY + INTEGRAL(2.5));
}
}
#define BOTTOM_SHADOW_OFFSET 18
@ -811,11 +818,11 @@ typedef NS_ENUM(NSUInteger, CellRow)
m_bookmarkData = NULL;
}
- (void)showBuildingRoutingActivity:(BOOL)building
- (void)showBuildingRoutingActivity:(BOOL)show
{
if (building)
self.routeButton.hidden = show;
if (show)
{
self.routeButton.hidden = YES;
self.routingActivity = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
self.routingActivity.center = CGPointMake(self.routeButton.midX, self.routeButton.midY + INTEGRAL(2.5));
[self.routeButton.superview addSubview:self.routingActivity];
@ -823,7 +830,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
}
else
{
self.routeButton.hidden = NO;
[self.routingActivity stopAnimating];
[self.routingActivity removeFromSuperview];
}
}