Skip to content

Fix missed branches that should check the feature flag #153

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.

Sign up for GitHub

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

Merged
devbridie merged 1 commit into from
Sep 26, 2025
Merged

Fix missed branches that should check the feature flag #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion feature/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ fun EditScreenScaffoldWithAppBar(
},
actions = {
AboutButton { onAboutPressed() }
if (couldRequestFullSpace()) {
if (uiState.xrEnabled && couldRequestFullSpace()) {
RequestFullSpaceIconButton()
}
},
Expand Down
12 changes: 7 additions & 5 deletions feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,13 @@ fun ResultsScreenContents(
},
actions = {
AboutButton { onAboutPress() }
if (couldRequestFullSpace()) {
RequestFullSpaceIconButton()
}
if (couldRequestHomeSpace()) {
RequestHomeSpaceIconButton()
if (state.xrEnabled) {
if (couldRequestFullSpace()) {
RequestFullSpaceIconButton()
}
if (couldRequestHomeSpace()) {
RequestHomeSpaceIconButton()
}
}
Comment on lines +141 to 148
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

While this is functionally correct, it introduces an extra level of nesting. For consistency with the changes in EditScreen.kt, you could combine the state.xrEnabled check into each of the inner if statements. This would flatten the structure and make the coding style more uniform across the codebase.

For example:

if (state.xrEnabled && couldRequestFullSpace()) {
    RequestFullSpaceIconButton()
}
if (state.xrEnabled && couldRequestHomeSpace()) {
    RequestHomeSpaceIconButton()
}

},
)
Expand Down