Skip to content

[Fix] scroll state fixed for color bot in landscape mode #61

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

Merged
riggaroo merged 1 commit into from
Jun 20, 2025
Merged

[Fix] scroll state fixed for color bot in landscape mode #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion ...reation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -61,6 +63,7 @@ fun AndroidBotColorPicker(
onBotColorSelected: (BotColor) -> Unit,
listBotColor: List<BotColor>,
) {
val scrollState = rememberScrollState()
Column(
modifier
.fillMaxWidth()
Expand All @@ -73,7 +76,9 @@ fun AndroidBotColorPicker(
FlowRow(
horizontalArrangement = Arrangement.spacedBy(12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp),
modifier = Modifier.align(Alignment.CenterHorizontally),
modifier = Modifier
.align(Alignment.CenterHorizontally)
.verticalScroll(scrollState),
) {
listBotColors.forEach {
AndroidBotIndividualColor(
Expand Down
11 changes: 6 additions & 5 deletions feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ fun AboutScreen(
Scaffold(
topBar = {
IconButton(
modifier = Modifier.safeDrawingPadding()
modifier = Modifier
.safeDrawingPadding()
.padding(16.dp),
shape = CircleShape,
colors = IconButtonDefaults.iconButtonColors(
Expand Down Expand Up @@ -162,7 +163,7 @@ fun AboutScreen(
)
}
Spacer(Modifier.size(48.dp))
FooterButtons()
FooterButtons(modifier = Modifier.padding(bottom = 8.dp))
}
}
} else {
Expand Down Expand Up @@ -196,17 +197,17 @@ fun AboutScreen(
stringResource(R.string.about_step3_label),
)
Spacer(modifier = Modifier.size(24.dp))
FooterButtons()
FooterButtons(modifier = Modifier.padding(bottom = 8.dp))
}
}
}
}
}

@Composable
private fun FooterButtons() {
private fun FooterButtons(modifier: Modifier = Modifier) {
val uriHandler = LocalUriHandler.current
Row {
Row(modifier) {
SecondaryOutlinedButton(
onClick = {
uriHandler.openUri("https://policies.google.com/terms")
Expand Down