Skip to content
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

Jump to bottom

Refactor Preview UI #31

Merged
merged 8 commits into from
Sep 28, 2023
Merged

Refactor Preview UI #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e74e88e
add onimagecapture and onstart/stoprecording functions
Kimblebee Aug 16, 2023
9c599d7
WIP: Preview Screen Refactor
Kimblebee Aug 17, 2023
cac5ffc
More UI Refactoring
Kimblebee Aug 18, 2023
cbb60d5
minor styling
Kimblebee Aug 21, 2023
76d80a2
Address PR comments
Kimblebee Aug 26, 2023
5549b0f
rebase + address pr comments
Kimblebee Sep 7, 2023
51fe392
address PR comments
Kimblebee Sep 19, 2023
01b3844
address s'more pr comments
Kimblebee Sep 26, 2023
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
270 changes: 85 additions & 185 deletions feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,17 @@ package com.google.jetpackcamera.feature.preview
import android.os.Handler
import android.os.Looper
import android.util.Log
import android.view.View
import androidx.camera.core.Preview.SurfaceProvider
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.gestures.rememberTransformableState
import androidx.compose.foundation.gestures.transformable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Button
import androidx.compose.material3.ChipColors
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -57,30 +40,28 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle
import com.google.jetpackcamera.feature.preview.ui.CaptureButton
import com.google.jetpackcamera.feature.preview.ui.FlipCameraButton
import com.google.jetpackcamera.feature.preview.ui.PreviewDisplay
import com.google.jetpackcamera.feature.preview.ui.SettingsNavButton
import com.google.jetpackcamera.feature.preview.ui.ZoomScaleText
import com.google.jetpackcamera.feature.quicksettings.QuickSettingsScreen
import com.google.jetpackcamera.viewfinder.CameraPreview
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.awaitCancellation

private const val TAG = "PreviewScreen"
private const val ZOOM_SCALE_SHOW_TIMEOUT_MS = 3000L

/**
* Screen used for the Preview feature.
*/
@OptIn(ExperimentalComposeUiApi::class)
@ExperimentalMaterial3Api
@Composable
fun PreviewScreen(
onNavigateToSettings: () -> Unit,
Expand All @@ -93,19 +74,13 @@ fun PreviewScreen(
val lifecycleOwner = LocalLifecycleOwner.current

val deferredSurfaceProvider = remember { CompletableDeferred<SurfaceProvider>() }
val onSurfaceProviderReady: (SurfaceProvider) -> Unit = {
Log.d(TAG, "onSurfaceProviderReady")
deferredSurfaceProvider.complete(it)
}
lateinit var viewInfo: View

var zoomScale by remember { mutableStateOf(1f) }

var zoomScaleShow by remember { mutableStateOf(false) }

val zoomHandler = Handler(Looper.getMainLooper())
val transformableState = rememberTransformableState(onTransformation = { zoomChange, _, _ ->
zoomScale = viewModel.setZoomScale(zoomChange)
zoomScaleShow = true
zoomHandler.postDelayed({ zoomScaleShow = false }, 3000)
})


LaunchedEffect(lifecycleOwner) {
val surfaceProvider = deferredSurfaceProvider.await()
Expand All @@ -118,71 +93,29 @@ fun PreviewScreen(
}
}
}

if (previewUiState.cameraState == CameraState.NOT_READY) {
Text(text = stringResource(R.string.camera_not_ready))
} else if (previewUiState.cameraState == CameraState.READY) {
BoxWithConstraints(
Modifier
.background(Color.Black)
.pointerInput(Unit) {
detectTapGestures(
onDoubleTap = { offset ->
Log.d(TAG, "onDoubleTap $offset")
viewModel.flipCamera()
},
onTap = { offset ->
// tap to focus
try {
viewModel.tapToFocus(
viewInfo.display,
viewInfo.width,
viewInfo.height,
offset.x, offset.y
)
Log.d(TAG, "onTap $offset")
} catch (e: UninitializedPropertyAccessException) {
Log.d(TAG, "onTap $offset")
e.printStackTrace()
}
}
)
},

contentAlignment = Alignment.Center
// display camera feed. this stays behind everything else
PreviewDisplay(
onFlipCamera = viewModel::flipCamera,
onTapToFocus = viewModel::tapToFocus,
onZoomChange = { zoomChange: Float ->
viewModel.setZoomScale(zoomChange)
zoomScaleShow = true
zoomHandler.postDelayed({ zoomScaleShow = false }, ZOOM_SCALE_SHOW_TIMEOUT_MS)
},
aspectRatio = previewUiState.currentCameraSettings.aspect_ratio,
deferredSurfaceProvider = deferredSurfaceProvider
)
// overlay
Box(
modifier = Modifier
.fillMaxSize()
) {
val maxAspectRatio: Float = maxWidth / maxHeight
val aspectRatio: Float =
previewUiState.currentCameraSettings.aspect_ratio.ratio.toFloat()
val shouldUseMaxWidth = maxAspectRatio <= aspectRatio
val width = if (shouldUseMaxWidth) maxWidth else maxHeight * aspectRatio
val height = if (!shouldUseMaxWidth) maxHeight else maxWidth / aspectRatio
Box(
modifier = Modifier
.width(width)
.height(height)
) {
Box(
modifier = Modifier
.fillMaxSize()
.transformable(state = transformableState)
) {
CameraPreview(
modifier = Modifier
.fillMaxSize(),
onSurfaceProviderReady = onSurfaceProviderReady,
onRequestBitmapReady = {
val bitmap = it.invoke()
},
setSurfaceView = { s: View ->
viewInfo = s
}
)
}
}

QuickSettingsScreen(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.align(Alignment.TopCenter),
isOpen = previewUiState.quickSettingsIsOpen,
toggleIsOpen = { viewModel.toggleQuickSettings() },
currentCameraSettings = previewUiState.currentCameraSettings,
Expand All @@ -194,106 +127,73 @@ fun PreviewScreen(
//onTimerClick = {}/*TODO*/
)

IconButton(
SettingsNavButton(
modifier = Modifier
.align(Alignment.TopStart)
.padding(12.dp),
onClick = onNavigateToSettings,
) {
Icon(
Icons.Filled.Settings,
contentDescription = stringResource(R.string.settings_content_description),
modifier = Modifier.size(72.dp)
)
}
onNavigateToSettings = onNavigateToSettings
)

SuggestionChip(
onClick = { viewModel.toggleCaptureMode() },
modifier = Modifier
.align(Alignment.TopEnd)
.padding(12.dp),
label = {
Text(
stringResource(
if (previewUiState.singleStreamCapture) {
R.string.capture_mode_single_stream
} else {
R.string.capture_mode_multi_stream
}
)
SuggestionChip(
onClick = { viewModel.toggleCaptureMode() },
modifier = Modifier
.align(Alignment.TopEnd)
.padding(12.dp),
label = {
Text(
stringResource(
if (previewUiState.singleStreamCapture) {
R.string.capture_mode_single_stream
} else {
R.string.capture_mode_multi_stream
}
)
}
)
)
}
)

Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.align(Alignment.BottomCenter)
) {
ZoomScaleText(
zoomScale = zoomScale,
show = zoomScaleShow
)
if (zoomScaleShow) {
ZoomScaleText(zoomScale = zoomScale)
}

Row(
horizontalArrangement = Arrangement.SpaceAround
modifier =
Modifier
.fillMaxWidth()
.height(IntrinsicSize.Min),
) {
Row {
CaptureButton(
onClick = { viewModel.captureImage() },
onLongPress = { viewModel.startVideoRecording() },
onRelease = { viewModel.stopVideoRecording() },
state = previewUiState.videoRecordingState
)
}
FlipCameraButton(
modifier = Modifier
.weight(1f)
.fillMaxHeight(),
onClick = { viewModel.flipCamera() },
//enable only when phone has front and rear camera
Kimblebee marked this conversation as resolved.
Show resolved Hide resolved
enabledCondition =
previewUiState.currentCameraSettings.back_camera_available
&& previewUiState.currentCameraSettings.front_camera_available
)
/*todo: close quick settings on start record/image capture*/
Kimblebee marked this conversation as resolved.
Show resolved Hide resolved
CaptureButton(
onClick = { viewModel.captureImage() },
onLongPress = { viewModel.startVideoRecording() },
onRelease = { viewModel.stopVideoRecording() },
videoRecordingState = previewUiState.videoRecordingState
)
/* spacer is a placeholder to maintain the proportionate location of this row of
Copy link
Member

Choose a reason for hiding this comment

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

nit: formatting for the comment

UI elements. if you want to add another element, replace it with ONE element.
If you want to add multiple components, use a container (Box, Row, Column, etc.)
*/
Spacer(
yasith marked this conversation as resolved.
Show resolved Hide resolved
modifier = Modifier
.fillMaxHeight()
.weight(1f)
)
}
}
}
}
}

@Composable
fun ZoomScaleText(zoomScale: Float, show: Boolean) {
val contentAlpha = animateFloatAsState(
targetValue = if (show) 1f else 0f, label = "zoomScaleAlphaAnimation",
animationSpec = tween()
)
Text(
modifier = Modifier.alpha(contentAlpha.value),
text = String.format("%.1fx", zoomScale),
fontSize = 20.sp,
color = Color.White
)
}

@Composable
fun CaptureButton(
onClick: () -> Unit,
onLongPress: () -> Unit,
onRelease: () -> Unit,
state: VideoRecordingState
) {
Box(
modifier = Modifier
.pointerInput(Unit) {
detectTapGestures(
onLongPress = {
onLongPress()
}, onPress = {
awaitRelease()
onRelease()
}, onTap = { onClick() })
}
.size(120.dp)
.padding(18.dp)
.border(4.dp, Color.White, CircleShape)
) {
Canvas(modifier = Modifier.size(110.dp), onDraw = {
drawCircle(
color =
when (state) {
VideoRecordingState.INACTIVE -> Color.Transparent
VideoRecordingState.ACTIVE -> Color.Red
}
)
})
}
}
Loading