Font with lazy get data in skikoMain #906
Merged
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
MatkovIvan
reviewed
Nov 20, 2023
| @@ -67,13 +67,19 @@ class SystemFont( | |||
| */ | |||
| class LoadedFont internal constructor( | |||
| override val identity: String, | |||
| val data: ByteArray, | |||
| val getData: () -> ByteArray, | |||
There was a problem hiding this comment.
Why do we need it in public?
There was a problem hiding this comment.
Yes, it is better to make it internal
| * | ||
| * @see FontFamily | ||
| */ | ||
| @Deprecated( |
There was a problem hiding this comment.
Let's avoid deprecation, just add new overload
| @@ -108,10 +114,10 @@ class LoadedFont internal constructor( | |||
| */ | |||
| fun Font( | |||
| identity: String, | |||
| data: ByteArray, | |||
| getData: () -> ByteArray, | |||
There was a problem hiding this comment.
Suggested change
| getData: () -> ByteArray, | |
| data: () -> ByteArray, |
or
Suggested change
| getData: () -> ByteArray, | |
| dataReader: () -> ByteArray, |
There was a problem hiding this comment.
I think, better to leave getData(). It is simple name for this case.
MatkovIvan
approved these changes
Nov 21, 2023
terrakok
reviewed
Nov 21, 2023
| override val weight: FontWeight, | ||
| override val style: FontStyle | ||
| ) : PlatformFont() { | ||
| @ExperimentalTextApi | ||
| override val loadingStrategy: FontLoadingStrategy = FontLoadingStrategy.Blocking | ||
|
|
||
| val data: ByteArray get() = getData() |
There was a problem hiding this comment.
I'm not sure but maybe better to make it by lazy to avoid unexpected multirun for the lambda
There was a problem hiding this comment.
Thanks for suggestion! Done!
MatkovIvan
previously requested changes
Nov 21, 2023
compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt
Outdated
Show resolved
Hide resolved
This reverts commit ccc9c7f.
terrakok
approved these changes
Nov 22, 2023
MatkovIvan
approved these changes
Nov 22, 2023
mazunin-v-jb
pushed a commit
that referenced
this pull request
Dec 7, 2023
We just added new function Font with lazy getData lambda. We don't need changes in Skiko library.
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.
We just added new function Font with lazy getData lambda.
We don't need changes in Skiko library.
@MatkovIvan Where are no good primitives for stream of bytes in Kotlin stdlib (This one declared in ktor.io framework https://api.ktor.io/ktor-io/io.ktor.utils.io/-byte-read-channel/index.html).
Anyway - fonts is not big enought, so be can fully handle it in memory.