Skip to content

Fix: Synchronize Toolbar with page state only after HorizontalPager animation completes #16

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 2 commits into from
May 23, 2025
Merged

Fix: Synchronize Toolbar with page state only after HorizontalPager animation completes #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a29b16
Remove UnUsed OptIn Annotation
kez-lab May 22, 2025
433b00a
Fix: ensure pager and toolbar state sync after interrupted animation
kez-lab May 22, 2025
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
19 changes: 13 additions & 6 deletions feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import com.android.developers.androidify.creation.R as CreationR

@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun CreationScreen(
fileName: String? = null,
Expand Down Expand Up @@ -364,7 +363,9 @@ fun EditScreen(
}
} else {
BottomButtons(
onButtonColorClicked = { showColorPickerBottomSheet = !showColorPickerBottomSheet },
onButtonColorClicked = {
showColorPickerBottomSheet = !showColorPickerBottomSheet
},
uiState = uiState,
onStartClicked = onStartClicked,
modifier = Modifier
Expand Down Expand Up @@ -404,10 +405,16 @@ private fun MainCreationPane(
val pagerState = rememberPagerState(0) { PromptType.entries.size }
val focusManager = LocalFocusManager.current
LaunchedEffect(uiState.selectedPromptOption) {
pagerState.animateScrollToPage(
uiState.selectedPromptOption.ordinal,
animationSpec = spatialSpec,
)
launch {
pagerState.animateScrollToPage(
uiState.selectedPromptOption.ordinal,
animationSpec = spatialSpec,
)
}.invokeOnCompletion {
if (uiState.selectedPromptOption != PromptType.entries[pagerState.currentPage]) {
onSelectedPromptOptionChanged(PromptType.entries[pagerState.currentPage])
}
}
}
LaunchedEffect(pagerState) {
snapshotFlow { pagerState.currentPage }.collect { page ->
Expand Down