Skip to content

scrollable setting dialog #492

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
Kimblebee merged 4 commits into from
Apr 10, 2026
+14 −9
Merged

scrollable setting dialog #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d1494e
scrollable setting dialog
Kimblebee Apr 6, 2026
e07389e
remove redundant scroll behavior for VideoQualitySetting
Kimblebee Apr 7, 2026
142aaac
update import statement for new val name
Kimblebee Apr 7, 2026
95214ba
revert change to close button tag, update scrollable containter tag t…
Kimblebee Apr 7, 2026
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
22 changes: 13 additions & 9 deletions feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,11 +791,7 @@ fun VideoQualitySetting(
}
},
popupContents = {
Column(
Modifier
.selectableGroup()
.verticalScroll(rememberScrollState())
) {
Column(Modifier.selectableGroup()) {
SingleChoiceSelector(
modifier = Modifier.testTag(
getVideoQualityOptionTestTag(VideoQuality.UNSPECIFIED)
Expand Down Expand Up @@ -920,10 +916,18 @@ fun BasicPopupSetting(
},
title = { Text(text = title) },
text = {
MaterialTheme(
colorScheme = MaterialTheme.colorScheme.copy(surface = Color.Transparent),
content = popupContents
)
// Apply a scroll state to ensure content is reachable
val scrollState = rememberScrollState()
Column(
modifier = Modifier
.testTag(CONTAINER_DIALOG_CONTENTS)
.verticalScroll(scrollState)
Comment thread
Kimblebee marked this conversation as resolved.
) {
MaterialTheme(
colorScheme = MaterialTheme.colorScheme.copy(surface = Color.Transparent),
content = popupContents
)
}
}
)
}
Expand Down
1 change: 1 addition & 0 deletions feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ package com.google.jetpackcamera.settings.ui
const val SETTINGS_TITLE = "SettingsTitle"
const val BACK_BUTTON = "BackButton"
const val CLOSE_BUTTON = "CloseButton"
const val CONTAINER_DIALOG_CONTENTS = "dialog_contents_container"

// unsupported rationale tags
const val DEVICE_UNSUPPORTED_TAG = "DeviceUnsupportedTag"
Expand Down
Loading