forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 154
Adds support for UiMediaScope in Desktop #3341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Apolo (ApoloApps)
wants to merge
7
commits into
JetBrains:jb-main
Choose a base branch
from
ApoloApps:uiMediaSupportInDesktop
base: jb-main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3395fd2
Add common logic for supporting UiMediaScope in Skiko platforms
ApoloApps 963fc17
Fix web tests failing after removing DefaultHapticFeedback in favor o…
ApoloApps 355cb49
Add UiMediaScope support to Desktop
ApoloApps a7c1cf7
Merge branch 'JetBrains:jb-main' into uiMediaSupportInDesktop
ApoloApps 36182ee
Merge branch 'jb-main' into uiMediaSupportInDesktop
ApoloApps 11d3f64
Discard changes to compose/ui/ui/src/skikoMain/kotlin/androidx/compos…
ApoloApps 82b4964
Renaming MediaEnvironment to MediaScope in Desktop and fixing after m…
ApoloApps File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
54 changes: 54 additions & 0 deletions
54
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/MediaScope.desktop.kt
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| @file:OptIn(ExperimentalMediaQueryApi::class) | ||
|
|
||
| package androidx.compose.ui.platform | ||
|
|
||
| import androidx.compose.ui.ExperimentalMediaQueryApi | ||
| import androidx.compose.ui.UiMediaScope | ||
| import androidx.compose.ui.unit.Dp | ||
|
|
||
| internal class DesktopMediaScope(val windowInfo: WindowInfo) : UiMediaScope { | ||
|
|
||
| override val windowPosture: UiMediaScope.Posture | ||
| get() = UiMediaScope.Posture.Flat | ||
|
|
||
| override val windowWidth: Dp | ||
| get() = windowInfo.containerDpSize.width | ||
|
|
||
| override val windowHeight: Dp | ||
| get() = windowInfo.containerDpSize.height | ||
|
|
||
| override val pointerPrecision: UiMediaScope.PointerPrecision | ||
| get() = UiMediaScope.PointerPrecision.Fine | ||
|
|
||
| override val keyboardKind: UiMediaScope.KeyboardKind | ||
| get() = UiMediaScope.KeyboardKind.Physical | ||
|
|
||
| override val hasMicrophone: Boolean | ||
| get() = true //inferred as always having at least 1 microphone | ||
|
|
||
| override val hasCamera: Boolean | ||
| get() = false //no reliable way to get it | ||
|
|
||
| override val viewingDistance: UiMediaScope.ViewingDistance | ||
| get() = UiMediaScope.ViewingDistance.Near | ||
|
|
||
| fun dispose() { | ||
| // No-op for now, but can be used to clean up resources if needed in the future. | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe not important, but
windowInfo.containerDpSizerefers to the container (excludes insets), and this refers to the window (includes insets).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does not seem to be a problem in Android -> https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/adaptive/MediaQuery.android.kt;drc=6f5685e7bb340e3d1127218e78671c21541cfe7b;l=66