Skip to content

add 7-mode CameraLayoutMode orchestrator and wire adaptive CaptureScaffold slots #653

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

Draft
Kimblebee wants to merge 5 commits into
base: kim/adaptive/layouts
Choose a base branch
from
Draft

add 7-mode CameraLayoutMode orchestrator and wire adaptive CaptureScaffold slots #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9225de4
feat(ui/capture, debug): add 6-mode CameraLayoutMode orchestrator and…
Kimblebee Nov 6, 2026
be1b474
Expand CameraLayoutMode to 7 postures and isolate placeholder side-ra…
Kimblebee Nov 11, 2026
211a934
Wire real CaptureScaffold slots into side-rail layouts
Kimblebee Nov 12, 2026
d0a0729
Merge branch 'kim/adaptive/layouts' into kim/adaptive/layout-orchestr…
Kimblebee Nov 13, 2026
da81b4b
refactor(ui/capture): forward isErrorDialogShowing and use placeRelat…
Kimblebee Nov 13, 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
352 changes: 323 additions & 29 deletions ...nts/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/CaptureLayout.kt
View file
Open in desktop

Large diffs are not rendered by default.

162 changes: 138 additions & 24 deletions ...s/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/CaptureScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ import androidx.compose.animation.ExitTransition
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.darkColorScheme
Expand All @@ -51,7 +53,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.google.jetpackcamera.core.camera.AudioStreamState
import com.google.jetpackcamera.core.camera.InitialRecordingSettings
import com.google.jetpackcamera.core.camera.VideoRecordingState
Expand All @@ -61,6 +65,7 @@ import com.google.jetpackcamera.model.CaptureMode
import com.google.jetpackcamera.model.ExternalCaptureMode
import com.google.jetpackcamera.model.LensFacing
import com.google.jetpackcamera.model.LensToZoom
import com.google.jetpackcamera.ui.components.capture.quicksettings.QuickSettingsContent
import com.google.jetpackcamera.ui.components.capture.quicksettings.QuickSettingsScaffoldContent
import com.google.jetpackcamera.ui.components.capture.quicksettings.ui.FlashModeIndicator
import com.google.jetpackcamera.ui.components.capture.quicksettings.ui.HdrIndicator
Expand All @@ -71,12 +76,15 @@ import com.google.jetpackcamera.ui.controller.ScreenFlashController
import com.google.jetpackcamera.ui.controller.SnackBarController
import com.google.jetpackcamera.ui.controller.ZoomController
import com.google.jetpackcamera.ui.controller.quicksettings.QuickSettingsController
import com.google.jetpackcamera.ui.uistate.DisableRationale
import com.google.jetpackcamera.ui.uistate.SingleSelectableUiState
import com.google.jetpackcamera.ui.uistate.SnackBarUiState
import com.google.jetpackcamera.ui.uistate.capture.AudioUiState
import com.google.jetpackcamera.ui.uistate.capture.CameraErrorUiState
import com.google.jetpackcamera.ui.uistate.capture.CaptureButtonUiState
import com.google.jetpackcamera.ui.uistate.capture.CaptureModeToggleUiState
import com.google.jetpackcamera.ui.uistate.capture.CaptureModeToggleUiState.Unavailable.findSelectableStateFor
import com.google.jetpackcamera.ui.uistate.capture.CaptureModeToggleUiState.Unavailable.isCaptureModeSelectable
import com.google.jetpackcamera.ui.uistate.capture.CaptureSubModeUiState
import com.google.jetpackcamera.ui.uistate.capture.ElapsedTimeUiState
import com.google.jetpackcamera.ui.uistate.capture.FlipLensUiState
Expand Down Expand Up @@ -498,12 +506,14 @@ object CaptureScaffoldDefaults {
fun ZoomControls(
uiState: ZoomControlUiState,
onChangeZoom: (Float) -> Unit,
modifier: Modifier = Modifier
modifier: Modifier = Modifier,
orientation: Orientation = Orientation.Horizontal
) {
Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
ZoomBar(
zoomControlUiState = uiState,
onChangeZoom = onChangeZoom
onChangeZoom = onChangeZoom,
orientation = orientation
)
}
}
Expand All @@ -518,19 +528,75 @@ object CaptureScaffoldDefaults {
isRecording: Boolean,
quickSettingsController: QuickSettingsController?,
snackBarController: SnackBarController?,
modifier: Modifier = Modifier
modifier: Modifier = Modifier,
orientation: Orientation = Orientation.Horizontal,
isCompact: Boolean = false
) {
if (!isRecording && uiState is CaptureModeToggleUiState.Available) {
CaptureModeToggleButton(
uiState = uiState,
onChangeCaptureMode = { newCaptureMode ->
quickSettingsController?.setCaptureMode(newCaptureMode)
},
onToggleWhenDisabled = { disableRationale ->
snackBarController?.enqueueDisabledHdrToggleSnackBar(disableRationale)
},
modifier = modifier.testTag(CAPTURE_MODE_TOGGLE_BUTTON)
)
// TODO(#635): Replace vertical placeholder with vertical CaptureModeToggleButton.
if (orientation == Orientation.Vertical) {
val enabled = uiState.isCaptureModeSelectable(CaptureMode.VIDEO_ONLY) &&
uiState.isCaptureModeSelectable(CaptureMode.IMAGE_ONLY) &&
uiState.selectedCaptureMode != CaptureMode.STANDARD
val placeholderLabel = if (uiState.selectedCaptureMode == CaptureMode.VIDEO_ONLY) {
"Video"
} else {
"Photo"
}
PlaceholderControlBox(
label = placeholderLabel,
width = if (isCompact) {
CaptureSlotTokens.ModeToggleCompactHeight
} else {
CaptureSlotTokens.ModeToggleStandardHeight
},
height = if (isCompact) {
CaptureSlotTokens.ModeToggleCompactWidth
} else {
CaptureSlotTokens.ModeToggleStandardWidth
},
modifier = modifier.clickable(
role = Role.Switch,
onClick = {
if (enabled) {
val nextMode =
if (uiState.selectedCaptureMode == CaptureMode.VIDEO_ONLY) {
CaptureMode.IMAGE_ONLY
} else {
CaptureMode.VIDEO_ONLY
}
quickSettingsController?.setCaptureMode(nextMode)
} else {
val disabledReason: DisableRationale? =
(
uiState.findSelectableStateFor(CaptureMode.VIDEO_ONLY) as?
SingleSelectableUiState.Disabled<CaptureMode>
)?.disabledReason
?: (
uiState.findSelectableStateFor(CaptureMode.IMAGE_ONLY)
as? SingleSelectableUiState.Disabled<CaptureMode>
)?.disabledReason
disabledReason?.let {
snackBarController?.enqueueDisabledHdrToggleSnackBar(it)
}
}
}
),
color = CaptureSlotTokens.ModeToggleColor,
testTag = CAPTURE_MODE_TOGGLE_BUTTON
)
} else {
CaptureModeToggleButton(
uiState = uiState,
onChangeCaptureMode = { newCaptureMode ->
quickSettingsController?.setCaptureMode(newCaptureMode)
},
onToggleWhenDisabled = { disableRationale ->
snackBarController?.enqueueDisabledHdrToggleSnackBar(disableRationale)
},
modifier = modifier.testTag(CAPTURE_MODE_TOGGLE_BUTTON)
)
}
}
}

Expand Down Expand Up @@ -616,7 +682,28 @@ object CaptureScaffoldDefaults {
* Default top status indicator pill reading slices from a deferred [uiState] provider.
*/
@Composable
fun TopBar(uiState: () -> CaptureUiState.Ready, modifier: Modifier = Modifier) {
fun TopBar(
uiState: () -> CaptureUiState.Ready,
modifier: Modifier = Modifier,
orientation: Orientation = Orientation.Horizontal,
isCompact: Boolean = false
) {
// TODO(#649): Replace vertical placeholder with VerticalIndicatorPill once #649 merges.
if (orientation == Orientation.Vertical) {
PlaceholderControlBox(
label = "Ind",
width = CaptureSlotTokens.IndicatorCrossAxisSize,
height = if (isCompact) {
CaptureSlotTokens.IndicatorCompactMainAxisSize
} else {
CaptureSlotTokens.IndicatorStandardMainAxisSize
},
modifier = modifier,
color = CaptureSlotTokens.IndicatorColor,
testTag = VIDEO_QUALITY_TAG
)
return
}
val currentUiState by rememberUpdatedState(uiState)
val flashModeState = remember { derivedStateOf { currentUiState().flashModeUiState } }
val hdrState = remember { derivedStateOf { currentUiState().hdrUiState } }
Expand Down Expand Up @@ -647,13 +734,25 @@ object CaptureScaffoldDefaults {
showMoreSettingsButton: Boolean = true
) {
if (controller != null) {
QuickSettingsScaffoldContent(
quickSettingsUiState = uiState,
onNavigateToSettings = onNavigateToSettings,
quickSettingsController = controller,
modifier = modifier,
showMoreSettingsButton = showMoreSettingsButton
)
if (LocalActiveCaptureLayout.current == "CompactPortraitLayout") {
QuickSettingsScaffoldContent(
quickSettingsUiState = uiState,
onNavigateToSettings = onNavigateToSettings,
quickSettingsController = controller,
modifier = modifier,
showMoreSettingsButton = showMoreSettingsButton
)
} else if (uiState is QuickSettingsUiState.Available) {
QuickSettingsContent(
quickSettingsUiState = uiState,
quickSettingsController = controller,
onNavigateToSettings = onNavigateToSettings,
modifier = modifier
.padding(vertical = 20.dp)
.testTag(QUICK_SETTINGS_BOTTOM_SHEET),
showMoreSettingsButton = showMoreSettingsButton
)
}
}
}

Expand Down Expand Up @@ -813,7 +912,12 @@ fun CaptureScaffold(
snackBarController: SnackBarController? = null,
screenFlashController: ScreenFlashController? = null,
topBar: @Composable CaptureSlotScope.(Modifier) -> Unit = { slotModifier ->
CaptureScaffoldDefaults.TopBar(uiState = captureUiState, modifier = slotModifier)
CaptureScaffoldDefaults.TopBar(
uiState = captureUiState,
modifier = slotModifier,
orientation = orientation,
isCompact = isCompact
)
},
captureButton: @Composable CaptureSlotScope.(Modifier) -> Unit = { slotModifier ->
val currentUiState by rememberUpdatedState(captureUiState)
Expand Down Expand Up @@ -845,7 +949,8 @@ fun CaptureScaffold(
CaptureScaffoldDefaults.ZoomControls(
uiState = zoomControlState.value,
onChangeZoom = ::animateZoomTo,
modifier = slotModifier
modifier = slotModifier,
orientation = orientation
)
},
captureModeToggle: @Composable CaptureSlotScope.(Modifier) -> Unit = { slotModifier ->
Expand All @@ -858,7 +963,9 @@ fun CaptureScaffold(
isRecording = isRecording,
quickSettingsController = quickSettingsController,
snackBarController = snackBarController,
modifier = slotModifier
modifier = slotModifier,
orientation = orientation,
isCompact = isCompact
)
},
captureModeCarousel: @Composable CaptureSlotScope.(Modifier) -> Unit = { slotModifier ->
Expand Down Expand Up @@ -1133,9 +1240,16 @@ fun CaptureScaffold(
)
}

val isErrorDialogShowing by remember {
derivedStateOf {
cameraErrorState.value is CameraErrorUiState.Showing && errorDialog != null
}
}

CaptureScaffoldLayout(
modifier = modifier,
state = state,
isErrorDialogShowing = isErrorDialogShowing,
onDismissQuickSettings = onDismissQuickSettings,
viewfinder = viewfinderLambda,
captureButton = { slotModifier ->
Expand Down
2 changes: 1 addition & 1 deletion ...apture/src/main/java/com/google/jetpackcamera/ui/components/capture/CompactShortLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ private fun PreviewOverlaySlotScope.ConstrainedSlot(
.coerceIn(constraints.minHeight, constraints.maxHeight)
layout(resolvedWidth, resolvedHeight) {
placeables.forEach { placeable ->
placeable.place(
placeable.placeRelative(
x = (resolvedWidth - placeable.width) / 2,
y = (resolvedHeight - placeable.height) / 2
)
Expand Down
11 changes: 10 additions & 1 deletion ...re/src/main/java/com/google/jetpackcamera/ui/components/capture/SideRailCaptureLayouts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,19 @@ internal fun SideRailCaptureScaffold(
)
}

val carouselHorizontalClearance = if (config.clearRailsForQuickSettings) {
topOverlayClearance
} else {
0.dp
}
OverlapAwareCaptureSlot(
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = config.hudVerticalPadding)
.padding(
start = carouselHorizontalClearance,
end = carouselHorizontalClearance,
bottom = config.hudVerticalPadding
)
.suppressBackgroundForModal(isModalOpen),
orientation = Orientation.Horizontal,
isCompact = config.isCompactHeight,
Expand Down
Loading
Loading