Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[ios] fix compass font thinner than previous version on iOS 13 #15547

Merged
merged 5 commits into from
Sep 4, 2019
Merged

[ios] fix compass font thinner than previous version on iOS 13 #15547

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f6921c
[ios] fix compass font thinner than previous version on iOS 13
m-stephen Sep 3, 2019
3a6ac94
Apply suggestions from code review
friedbunny Sep 3, 2019
62fa1f1
[ios] fix code format
m-stephen Sep 4, 2019
76d2cd3
[ios]update changelog
m-stephen Sep 4, 2019
3029993
Merge branch 'master' into stephen-ios13-compass
m-stephen Sep 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion platform/ios/src/MGLCompassButton.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,17 @@ - (UIImage *)compassImage {
UIImage *scaleImage = [UIImage mgl_resourceImageNamed:@"Compass"];
UIGraphicsBeginImageContextWithOptions(scaleImage.size, NO, UIScreen.mainScreen.scale);
[scaleImage drawInRect:{CGPointZero, scaleImage.size}];

UIFont *northFont;
if(@available(iOS 13, *)){
friedbunny marked this conversation as resolved.
Show resolved Hide resolved
northFont = [UIFont systemFontOfSize:11 weight:UIFontWeightLight];
}
friedbunny marked this conversation as resolved.
Show resolved Hide resolved
else{
friedbunny marked this conversation as resolved.
Show resolved Hide resolved
northFont = [UIFont systemFontOfSize:11 weight:UIFontWeightUltraLight];
}

NSAttributedString *north = [[NSAttributedString alloc] initWithString:NSLocalizedStringWithDefaultValue(@"COMPASS_NORTH", nil, nil, @"N", @"Compass abbreviation for north") attributes:@{
NSFontAttributeName: [UIFont systemFontOfSize:11 weight:UIFontWeightUltraLight],
NSFontAttributeName: northFont,
NSForegroundColorAttributeName: [UIColor whiteColor],
}];
CGRect stringRect = CGRectMake((scaleImage.size.width - north.size.width) / 2,
Expand Down