Skip to content
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

Jump to bottom

[JetSurvey] Use AnimatedContent to slide in and out changes between questions #842

Merged
merged 6 commits into from
Jun 20, 2022
Merged

[JetSurvey] Use AnimatedContent to slide in and out changes between questions #842

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9663193
Animate the changes between different question screens, as well as th…
riggaroo Jun 12, 2022
2ad9314
Merge branch 'main' into riggaroo/jetsurvey-animated-content
riggaroo Jun 12, 2022
ab5f441
spotless
riggaroo Jun 12, 2022
f280795
Change duration
riggaroo Jun 12, 2022
fd679d4
Switch to slideIntoContainer
riggaroo Jun 12, 2022
e13e007
PR Feedback
riggaroo Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 27 additions & 5 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.result.contract.ActivityResultContracts.TakePicture
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.with
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.platform.ComposeView
import androidx.fragment.app.Fragment
Expand All @@ -41,6 +48,7 @@ class SurveyFragment : Fragment() {
}
}

@OptIn(ExperimentalAnimationApi::class)
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
Expand All @@ -56,20 +64,34 @@ class SurveyFragment : Fragment() {
)
setContent {
JetsurveyTheme {
viewModel.uiState.observeAsState().value?.let { surveyState ->
when (surveyState) {
val state = viewModel.uiState.observeAsState().value ?: return@JetsurveyTheme
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the ?: return@JetsurveyTheme change?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I needed a non-nullable state, and I generally prefer early returns instead of wrapping content in lets 😄 https://betterprogramming.pub/are-early-returns-any-good-eed4b4d03866

AnimatedContent(
targetState = state,
transitionSpec = {
fadeIn() + slideIntoContainer(
towards = AnimatedContentScope
.SlideDirection.Up,
animationSpec = tween(600)
) with
fadeOut(animationSpec = tween(200))
IanGClifton marked this conversation as resolved.
Show resolved Hide resolved
}
) { targetState ->
// It's important to use targetState and not state, as its critical to ensure
// a successful lookup of all the incoming and outgoing content during
// content transform.
when (targetState) {
is SurveyState.Questions -> SurveyQuestionsScreen(
questions = surveyState,
questions = targetState,
shouldAskPermissions = viewModel.askForPermissions,
onAction = { id, action -> handleSurveyAction(id, action) },
onDoNotAskForPermissions = { viewModel.doNotAskForPermissions() },
onDonePressed = { viewModel.computeResult(surveyState) },
onDonePressed = { viewModel.computeResult(targetState) },
onBackPressed = {
activity?.onBackPressedDispatcher?.onBackPressed()
}
)
is SurveyState.Result -> SurveyResultScreen(
result = surveyState,
result = targetState,
onDonePressed = {
activity?.onBackPressedDispatcher?.onBackPressed()
}
Expand Down
69 changes: 53 additions & 16 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@

package com.example.compose.jetsurvey.survey

import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.core.TweenSpec
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.animation.with
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -51,11 +57,15 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import com.example.compose.jetsurvey.R
import com.example.compose.jetsurvey.theme.progressIndicatorBackground
import com.example.compose.jetsurvey.util.supportWideScreen

private const val CONTENT_ANIMATION_DURATION = 500

@OptIn(ExperimentalAnimationApi::class)
@Composable
fun SurveyQuestionsScreen(
questions: SurveyState.Questions,
Expand All @@ -79,22 +89,49 @@ fun SurveyQuestionsScreen(
)
},
content = { innerPadding ->
Question(
question = questionState.question,
answer = questionState.answer,
shouldAskPermissions = shouldAskPermissions,
onAnswer = {
if (it !is Answer.PermissionsDenied) {
questionState.answer = it
}
questionState.enableNext = true
},
onAction = onAction,
onDoNotAskForPermissions = onDoNotAskForPermissions,
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
)
AnimatedContent(
targetState = questionState,
transitionSpec = {
val animationSpec: TweenSpec<IntOffset> = tween(CONTENT_ANIMATION_DURATION)
val direction =
if (targetState.questionIndex > initialState.questionIndex) {
// Going forwards in the survey: Set the initial offset to start
// at the size of the content so it slides in from right to left, and
// slides out from the left of the screen to -fullWidth
AnimatedContentScope.SlideDirection.Left
} else {
// Going back to the previous question in the set, we do the same
// transition as above, but with different offsets - the inverse of
// above, negative fullWidth to enter, and fullWidth to exit.
AnimatedContentScope.SlideDirection.Right
}
slideIntoContainer(
towards = direction,
animationSpec = animationSpec
) with
slideOutOfContainer(
towards = direction,
animationSpec = animationSpec
)
}
) { targetState ->
Question(
question = targetState.question,
answer = targetState.answer,
shouldAskPermissions = shouldAskPermissions,
onAnswer = {
if (it !is Answer.PermissionsDenied) {
targetState.answer = it
}
targetState.enableNext = true
},
onAction = onAction,
onDoNotAskForPermissions = onDoNotAskForPermissions,
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
)
}
},
bottomBar = {
SurveyBottomBar(
Expand Down