Get environment and select resource by qualifiers #4018
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
...sources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.kt
Outdated
Show resolved
Hide resolved
...ources/library/src/iosMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.ios.kt
Outdated
Show resolved
Hide resolved
...es/library/src/macosMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.macos.kt
Outdated
Show resolved
Hide resolved
terrakok
force-pushed
the
k.tskh/res-qualifiers
branch
from
e88fa3d to
5208ef6
Compare
dima-avdeev-jb
approved these changes
Dec 11, 2023
terrakok
force-pushed
the
k.tskh/res-qualifiers
branch
from
5208ef6 to
3f0c12e
Compare
MatkovIvan
reviewed
Dec 12, 2023
components/resources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/Qualifier.kt
Outdated
Show resolved
Hide resolved
...ibrary/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.desktop.kt
Show resolved
Hide resolved
| internal actual fun getResourceEnvironment(): ResourceEnvironment { | ||
| val locale = Intl.Locale(window.navigator.language) | ||
| val isDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches | ||
| val dpi: Int = (window.devicePixelRatio * 96).toInt() |
There was a problem hiding this comment.
Let's make 96 a constant, not just magic number. Or extension function for conversion
There was a problem hiding this comment.
I will add just a comment here. Constant with the only usage is overkill
| val displaySizePX = CGDisplayPixelsWide(screenNumber).toFloat() * backingScaleFactor | ||
| val displaySizeMM = CGDisplayScreenSize(screenNumber).useContents { width } | ||
|
|
||
| //1 inch = 25.4 mm |
There was a problem hiding this comment.
The same. It's better to have named constant or explicit conversion function
There was a problem hiding this comment.
there is no a reason to have such small granularity
There was a problem hiding this comment.
Function should be easy readable. Granularity and cleanness are tools for achieve that, not otherwise
pjBooms
suggested changes
Dec 19, 2023
...s/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt
Outdated
Show resolved
Hide resolved
| items = setOf(ResourceItem(emptySet(), path)) | ||
| ) | ||
|
|
||
| /** | ||
| * Retrieves a [Painter] using the specified image resource. | ||
| * Retrieves a [Painter] using the specified drawable resource. |
There was a problem hiding this comment.
I would add more details about file types (extensions) we support.
...sources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.kt
Show resolved
Hide resolved
...sources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.kt
Outdated
Show resolved
Hide resolved
...sources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.kt
Outdated
Show resolved
Hide resolved
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt
Show resolved
Hide resolved
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt
Show resolved
Hide resolved
pjBooms
reviewed
Dec 19, 2023
...sources/library/src/commonMain/kotlin/org/jetbrains/compose/resources/ResourceEnvironment.kt
Show resolved
Hide resolved
pjBooms
suggested changes
Dec 19, 2023
| qualifiersMap[regionQualifier]?.let { q -> | ||
| val lang = qualifiersMap[languageQualifier] | ||
| if (lang == null) { | ||
| error("Region qualifier must be used only with language") |
There was a problem hiding this comment.
May we provide a context here for users to understand where they did mistake?
There was a problem hiding this comment.
Please add dot to the end of the sentence
pjBooms
approved these changes
Dec 20, 2023
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.
No description provided.