Rearrange buttons to avoid scrolling vertically on phone landscape

Author: tiwiz

core/util/src/main/java/com/android/developers/androidify/util/LayoutUtils.kt

@@ -49,6 +49,12 @@ fun isHeightAtLeastMedium(): Boolean {
     return sizeClass.isHeightAtLeastBreakpoint(WindowSizeClass.HEIGHT_DP_MEDIUM_LOWER_BOUND)
 }
 
+@Composable
+fun isHorizontalWindow(): Boolean {
+    val sizeClass = calculateWindowSizeClass()
+    return sizeClass.minWidthDp >= sizeClass.minHeightDp
+}
+
 /***
  * This function is useful to limit the number of buttons when the window is too small to show
  * everything that should otherwise appear on the screen.

feature/creation/src/main/java/com/android/developers/androidify/creation/PhotoPrompt.kt

@@ -98,6 +98,7 @@ import com.android.developers.androidify.theme.components.SecondaryOutlinedButto
 import com.android.developers.androidify.theme.sharedBoundsRevealWithShapeMorph
 import com.android.developers.androidify.theme.sharedBoundsWithDefaults
 import com.android.developers.androidify.util.dashedRoundedRectBorder
+import com.android.developers.androidify.util.isHorizontalWindow
 import com.android.developers.androidify.creation.R as CreationR
 
 @Composable
@@ -169,6 +170,27 @@ private fun UploadEmptyState(
     onCameraPressed: () -> Unit,
     onChooseImagePress: () -> Unit,
     modifier: Modifier = Modifier,
+) {
+    if (isHorizontalWindow()) {
+        HorizontallyAlignedUploadEmptyState(
+            onCameraPressed = onCameraPressed,
+            onChooseImagePress = onChooseImagePress,
+            modifier = modifier,
+        )
+    } else {
+        VerticallyAlignedUploadEmptyState(
+            onCameraPressed = onCameraPressed,
+            onChooseImagePress = onChooseImagePress,
+            modifier = modifier,
+        )
+    }
+}
+
+@Composable
+private fun VerticallyAlignedUploadEmptyState(
+    onCameraPressed: () -> Unit,
+    onChooseImagePress: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier
@@ -206,6 +228,45 @@ private fun UploadEmptyState(
     }
 }
 
+@Composable
+private fun HorizontallyAlignedUploadEmptyState(
+    onCameraPressed: () -> Unit,
+    onChooseImagePress: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .padding(16.dp),
+        horizontalArrangement = Arrangement.SpaceEvenly,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        TakePhotoButton(onCameraPressed)
+        Text(
+            stringResource(CreationR.string.photo_picker_title),
+            fontSize = 28.sp,
+            textAlign = TextAlign.Center,
+            lineHeight = 40.sp,
+            minLines = 2,
+            maxLines = 2,
+        )
+        SecondaryOutlinedButton(
+            onClick = {
+                onChooseImagePress()
+            },
+            leadingIcon = {
+                Image(
+                    painterResource(CreationR.drawable.choose_picture_image),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .padding(end = 8.dp)
+                        .size(24.dp),
+                )
+            },
+            buttonText = stringResource(CreationR.string.photo_picker_choose_photo_label),
+        )
+    }
+}
+
 @Composable
 private fun TakePhotoButton(onCameraPressed: () -> Unit) {
     val interactionSource = remember { MutableInteractionSource() }