[TIMOB-25161] iOS: Add thin, light, ultra-light & semi-bold font-sizes #9308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@hansemannn Can you resolve conflict here. Thanks. |
vijaysingh-axway
suggested changes
Aug 15, 2017
iphone/Classes/WebFont.m
Outdated
| if (self.isSemiboldWeight) { | ||
| font = [[UIFont systemFontOfSize:self.size weight:UIFontWeightSemibold] retain]; | ||
| } else if (self.isItalicStyle) { | ||
| font = [[UIFont italicSystemFontOfSize:self.size] retain]; |
There was a problem hiding this comment.
Why put this api inside block of iOS 8.2 and greater ?
iphone/Classes/WebFont.m
Outdated
| didChange |= (self.isBoldWeight)||(self.isSemiboldWeight)||!(self.isNormalWeight); | ||
| if ([fontWeightObject isEqualToString:@"semibold"]) { | ||
| didChange |= !(self.isSemiboldWeight)||(self.isBoldWeight)||(self.isNormalWeight)||(self.isThinWeight)||(self.isLightWeight)||(self.isUltraLightWeight); | ||
| self.isSemiboldWeight = YES; |
hansemannn
force-pushed
the
TIMOB-25161
branch
from
1748a65
to
cddd311
Compare
|
@vijaysingh-axway We linted the iOS source yesterday night, so in case you are wondering why the line numbers differ: That's why. For your PR's (which will also all have merge conflicts), you can just pull from master, use your local version for resolving the conflicts and call |
ewieberappc
approved these changes
Aug 16, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA: https://jira.appcelerator.org/browse/TIMOB-25161