Alter font loading code to support fallback fonts in fontFamily
#31
+118
−11
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
stevenpetryk
force-pushed
the
i18n-fallback-testing
branch
3 times, most recently
from
ec024e0
to
767848d
Compare
stevenpetryk
force-pushed
the
i18n-fallback-testing
branch
from
e9af024
to
e69c6d9
Compare
stevenpetryk
commented
Nov 14, 2022
| @@ -192,14 +192,50 @@ - (NSParagraphStyle *)effectiveParagraphStyle | |||
|
|
|||
| - (UIFont *)effectiveFont | |||
| { | |||
| // FIXME: RCTFont has thread-safety issues and must be rewritten. | |||
stevenpetryk
commented
Nov 15, 2022
Comment on lines
143
to
155
| String[] fontFamilyNames = fontFamilyName != null ? fontFamilyName.split(",") : null; | ||
| if (fontFamilyNames != null) { | ||
| for (int i = 0; i < fontFamilyNames.length; i++) { | ||
| fontFamilyNames[i] = fontFamilyNames[i].trim(); | ||
| } | ||
| } | ||
| if (fontFamilyNames != null && fontFamilyNames.length > 1) { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { | ||
| return createAssetTypefaceWithFallbacks(fontFamilyNames, style, assetManager); | ||
| } else { | ||
| fontFamilyName = fontFamilyNames[0]; | ||
| } | ||
| } |
There was a problem hiding this comment.
A few checks happening here:
- First we really carefully try to see whether a comma-separated list was passed to
fontFamilyName - If it was, we split it and trim whitespace off each entry (to allow folks to put spaces around commas)
- Finally, iff that list has more than one thing and we're on a high enough version of Android, we use the fallback font creation code. If we're on an older version of Android, we just ignore the fallbacks and proceed wit the original logic.
stevenpetryk
changed the title
stevenpetryk
changed the title
fontFamily
stevenpetryk
commented
Nov 15, 2022
Comment on lines
110
to
115
| private boolean getIsReduceMotionEnabledValue() { | ||
| float defaultAnimationScale = Float.parseFloat(Settings.Global.TRANSITION_ANIMATION_SCALE); | ||
| float animationScale = Settings.Global.getFloat(mContentResolver, defaultAnimationScale); | ||
| return animationScale == 0f; | ||
| String value = | ||
| Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); | ||
|
|
||
| return value != null && value.equals("0.0"); | ||
| } |
There was a problem hiding this comment.
These changes are unrelated to the PR but they're necessary to get RN to compile locally
stevenpetryk
commented
Nov 15, 2022
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.
This is some pre-work to improving how non-latin scripts render. On the web, one can declare fallback fonts easily:
And that'll attempt to use those fonts, in that order, falling back to the next font whenever a character can't be rendered by the given font.
React Native doesn't support this, and issues asking for support have been closed as stale by a bot. This adds some sliiiightly jank code to support it. I originally wanted to do something like this:
But I settled for this to minimize the diff size compared to upstream:
The native code now just splits
fontFamilynames by commas and uses that to construct fallback-filled UIFont/Typeface instances.