From cbd9c0cc3b76111450e9b8e9c369213ae12792fa Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 11 Aug 2025 13:46:59 +0100 Subject: [PATCH 1/2] Make tool items scrollable and adjust size This commit makes the following changes: - Makes the AspectRatioTool scrollable vertically. - Changes the BackgroundTool item size to a fixed 70dp, removing the aspect ratio constraint - to fix sizing on foldables --- .../developers/androidify/customize/AspectRatioTool.kt | 5 ++++- .../developers/androidify/customize/BackgroundTool.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt index 150b65cc..588b9bd8 100644 --- a/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt +++ b/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt @@ -23,6 +23,8 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -41,7 +43,8 @@ fun AspectRatioTool( singleLine: Boolean = true, ) { GenericTool( - modifier = modifier.wrapContentSize(), + modifier = modifier.wrapContentSize() + .verticalScroll(rememberScrollState()), tools = sizeOptions, singleLine = singleLine, selectedOption = selectedOption, diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/BackgroundTool.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/BackgroundTool.kt index bd50a4b8..957d09e5 100644 --- a/feature/results/src/main/java/com/android/developers/androidify/customize/BackgroundTool.kt +++ b/feature/results/src/main/java/com/android/developers/androidify/customize/BackgroundTool.kt @@ -61,7 +61,7 @@ fun BackgroundTool( individualToolContent = { tool -> Box( modifier = Modifier - .aspectRatio(1f) + .size(70.dp) .border( 2.dp, color = MaterialTheme.colorScheme.primary, From c8fac75656e15c032ed4b377134aa45466938cb4 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 11 Aug 2025 15:15:27 +0100 Subject: [PATCH 2/2] Code alignment --- .../android/developers/androidify/customize/AspectRatioTool.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt index 588b9bd8..d4b81201 100644 --- a/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt +++ b/feature/results/src/main/java/com/android/developers/androidify/customize/AspectRatioTool.kt @@ -40,7 +40,7 @@ fun AspectRatioTool( selectedOption: SizeOption, onSizeOptionSelected: (SizeOption) -> Unit, modifier: Modifier = Modifier, - singleLine: Boolean = true, + singleLine: Boolean = false, ) { GenericTool( modifier = modifier.wrapContentSize()