-
Notifications
You must be signed in to change notification settings - Fork 344
feat: adds new snippet region tag for Desktop Windowing #834
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
prateekbatra-g
wants to merge
2
commits into
main
Choose a base branch
from
prateek/adaptive_desktop_windowing
base: 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
2 commits
Select commit
Hold shift + click to select a range
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
64 changes: 64 additions & 0 deletions
64
...e/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/DesktopWindowing.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,64 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
|
|
||
| package com.example.compose.snippets.adaptivelayouts | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.ExperimentalLayoutApi | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.WindowInsets | ||
| import androidx.compose.foundation.layout.captionBar | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.isCaptionBarVisible | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.windowInsetsTopHeight | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| // [START android_compose_desktop_window_insets_title] | ||
| @OptIn(ExperimentalLayoutApi::class) | ||
| @Composable | ||
| fun CaptionBar() { | ||
| if (WindowInsets.isCaptionBarVisible) { | ||
| Row( | ||
| modifier = Modifier | ||
| .windowInsetsTopHeight(WindowInsets.captionBar) | ||
| .fillMaxWidth() | ||
| .background( | ||
| if (isSystemInDarkTheme()) | ||
| Color.White | ||
| else Color.Black | ||
|
|
||
| ), | ||
| horizontalArrangement = Arrangement.Center, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Text( | ||
| "Caption Bar Title", | ||
| style = MaterialTheme.typography.titleMedium, | ||
| modifier = Modifier.padding(4.dp) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| // [END android_compose_desktop_window_insets_title] | ||
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.
The background color logic for dark and light themes is inverted, which will cause the text to be unreadable due to poor contrast. In dark mode, this sets a white background while the text color from the theme is likely light, making it illegible. A similar issue occurs in light theme with a black background and dark text.
While swapping
Color.WhiteandColor.Blackwould fix the immediate issue, a better long-term solution is to use colors from yourMaterialTheme. Since you're already usingMaterialTheme.typography, using theme colors for the background will make your component more robust and adaptable.Here's a suggestion that fixes the inversion. For a more robust solution, consider refactoring to use theme colors like
MaterialTheme.colorScheme.surfaceVariantfor the background andonSurfaceVariantfor the text.