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

[ios] PP with updated layout

Browse source
This commit is contained in:
Igor Khmurets 2014-07-07 16:27:59 +02:00 • committed by Alex Zolotarev
parent 359ae99930
commit 1e35f5a6f8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/PlacePageEditCell.mm
View file

@ -24,7 +24,7 @@
[self addSubview:editImageView];
UIImage * separatorImage = [[UIImage imageNamed:@"PlacePageSeparator"] resizableImageWithCapInsets:UIEdgeInsetsZero];
CGFloat const offset = 15;
CGFloat const offset = 12.5;
UIImageView * separator = [[UIImageView alloc] initWithFrame:CGRectMake(offset, self.height - separatorImage.size.height, self.width - 2 * offset, separatorImage.size.height)];
separator.image = separatorImage;
separator.maxY = self.height;
@ -34,7 +34,7 @@
return self;
}
#define LEFT_SHIFT 19
#define LEFT_SHIFT 20
#define RIGHT_SHIFT 47
#define TITLE_FONT [UIFont fontWithName:@"HelveticaNeue-Light" size:17.5]

4
iphone/Maps/Classes/PlacePageInfoCell.mm
View file

@ -125,10 +125,10 @@
CGFloat coordinatesShift = self.addressLabel.height ? 10 : 0;
self.coordinatesLabel.frame = CGRectMake(ADDRESS_LEFT_SHIFT, self.addressLabel.maxY + coordinatesShift, self.width - ADDRESS_LEFT_SHIFT - COORDINATES_RIGHT_SHIFT, 24);
self.selectedColorView.center = CGPointMake(self.width - 32, 27);
self.selectedColorView.center = CGPointMake(self.width - 30, 27);
self.separatorView.maxY = self.height;
CGFloat const shift = 15;
CGFloat const shift = 12.5;
self.separatorView.width = self.width - 2 * shift;
self.separatorView.minX = shift;

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

@ -244,7 +244,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
self.titleLabel.text = self.title;
self.titleLabel.width = [self titleWidth];
[self.titleLabel sizeToFit];
self.titleLabel.origin = CGPointMake(23, 29);
self.titleLabel.origin = CGPointMake(20, 29);
if ([self isMyPosition])
self.typeLabel.text = [[MapsAppDelegate theApp].m_locationManager formattedSpeedAndAltitude:m_hasSpeed];
@ -252,9 +252,9 @@ typedef NS_ENUM(NSUInteger, CellRow)
self.typeLabel.text = self.types;
self.typeLabel.width = [self typesWidth];
[self.typeLabel sizeToFit];
self.typeLabel.origin = CGPointMake(self.titleLabel.minX + 1, self.titleLabel.maxY + 1);
self.typeLabel.origin = CGPointMake(self.titleLabel.minX, self.titleLabel.maxY + 1);
self.bookmarkButton.center = CGPointMake(self.headerView.width - 32, 42);
self.bookmarkButton.center = CGPointMake(self.headerView.width - 30, 42);
}
- (CGFloat)titleWidth
@ -981,7 +981,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
self.bookmarkButton.center = CGPointMake(_headerView.width - 32, 42);
UIImage * separatorImage = [[UIImage imageNamed:@"PlacePageSeparator"] resizableImageWithCapInsets:UIEdgeInsetsZero];
CGFloat const offset = 15;
CGFloat const offset = 12.5;
UIImageView * separator = [[UIImageView alloc] initWithFrame:CGRectMake(offset, _headerView.height - separatorImage.size.height, _headerView.width - 2 * offset, separatorImage.size.height)];
separator.image = separatorImage;
separator.maxY = _headerView.height;