Skip to content

Commit a13a286

Browse files
authored
Update CameraLayout.kt
1 parent afb4e8f commit a13a286

File tree

1 file changed

+7
-6
lines changed
  • feature/camera/src/main/java/com/android/developers/androidify/camera

1 file changed

+7
-6
lines changed

feature/camera/src/main/java/com/android/developers/androidify/camera/CameraLayout.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,13 @@ private fun TableTopReadyCameraLayout(
255255
)
256256
}
257257
HorizontalControlsLayout(
258+
modifier = Modifier
259+
.weight(1f)
260+
.padding(bottom = 16.dp),
258261
captureButton,
259262
flipCameraButton,
260263
zoomButton,
261264
rearCameraButton,
262-
modifier = Modifier
263-
.weight(1f)
264-
.padding(bottom = 16.dp),
265265
)
266266
}
267267
}
@@ -296,11 +296,11 @@ private fun TableTopCameraLayout(
296296
) {
297297
guideText(Modifier.align(Alignment.TopCenter))
298298
HorizontalControlsLayout(
299+
modifier = Modifier.align(Alignment.Center),
299300
captureButton,
300301
flipCameraButton,
301302
zoomButton,
302303
rearCameraButton,
303-
modifier = Modifier.align(Alignment.Center),
304304
)
305305
}
306306
}
@@ -373,6 +373,7 @@ private fun VerticalCameraLayout(
373373
)
374374
}
375375
HorizontalControlsLayout(
376+
modifier = Modifier,
376377
captureButton,
377378
flipCameraButton,
378379
zoomButton,
@@ -384,11 +385,11 @@ private fun VerticalCameraLayout(
384385

385386
@Composable
386387
private fun HorizontalControlsLayout(
388+
modifier: Modifier = Modifier,
387389
captureButton: @Composable (modifier: Modifier) -> Unit,
388390
flipCameraButton: (@Composable (modifier: Modifier) -> Unit)?,
389391
zoomButton: (@Composable (modifier: Modifier) -> Unit)?,
390392
rearCameraButton: (@Composable (modifier: Modifier) -> Unit)? = null,
391-
modifier: Modifier = Modifier,
392393
) {
393394
Column(
394395
modifier = modifier,
@@ -414,10 +415,10 @@ private fun HorizontalControlsLayout(
414415

415416
@Composable
416417
private fun VerticalControlsLayout(
417-
modifier: Modifier = Modifier,
418418
captureButton: @Composable (modifier: Modifier) -> Unit,
419419
flipCameraButton: (@Composable (modifier: Modifier) -> Unit)?,
420420
zoomButton: (@Composable (modifier: Modifier) -> Unit)?,
421+
modifier: Modifier = Modifier,
421422
) {
422423
Row(
423424
modifier = modifier,

0 commit comments

Comments
 (0)