[Jetsurvey] Fixing the way the state is updated when taking a photo

Author: florina-muntenescu

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt

@@ -311,7 +311,8 @@ private fun PhotoQuestion(
     }
     OutlinedButton(
         onClick = { onAction(questionId, SurveyActionType.TAKE_PHOTO) },
-        modifier = modifier
+        modifier = modifier,
+        contentPadding = PaddingValues()
     ) {
         Column {
             if (answer != null && answer.result is SurveyActionResult.Photo) {
@@ -326,7 +327,8 @@ private fun PhotoQuestion(
                 modifier = Modifier
                     .fillMaxWidth()
                     .wrapContentSize(Alignment.BottomCenter)
-                    .padding(vertical = 26.dp)
+                    .padding(vertical = 26.dp),
+                verticalAlignment = Alignment.Bottom
             ) {
                 Icon(resource)
                 Spacer(modifier = Modifier.width(8.dp))

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyRepository.kt

@@ -25,11 +25,6 @@ import com.example.compose.jetsurvey.survey.SurveyActionType.TAKE_PHOTO
 
 // Static data of questions
 private val jetpackQuestions = listOf(
-    Question(
-        id = 975,
-        questionText = R.string.selfie_skills,
-        answer = Action(label = R.string.add_photo, actionType = TAKE_PHOTO)
-    ),
     Question(
         id = 1,
         questionText = R.string.in_my_free_time,
@@ -86,6 +81,11 @@ private val jetpackQuestions = listOf(
             startText = R.string.selfie_min,
             endText = R.string.selfie_max
         )
+    ),
+    Question(
+        id = 975,
+        questionText = R.string.selfie_skills,
+        answer = Action(label = R.string.add_photo, actionType = TAKE_PHOTO)
     )
 )
 private val jetpackSurvey = Survey(

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyScreen.kt

@@ -41,10 +41,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Providers
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.savedinstancestate.savedInstanceState
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.annotatedString
@@ -61,9 +58,9 @@ fun SurveyQuestionsScreen(
     onDonePressed: () -> Unit,
     onBackPressed: () -> Unit
 ) {
-    var currentQuestionIndex by savedInstanceState { 0 }
-    val questionState =
-        remember(currentQuestionIndex) { questions.questionsState[currentQuestionIndex] }
+    val questionState = remember(questions.currentQuestionIndex) {
+        questions.questionsState[questions.currentQuestionIndex]
+    }
 
     Surface(modifier = Modifier.fillMaxSize()) {
         Scaffold(
@@ -91,8 +88,8 @@ fun SurveyQuestionsScreen(
             bottomBar = {
                 SurveyBottomBar(
                     questionState = questionState,
-                    onPreviousPressed = { currentQuestionIndex-- },
-                    onNextPressed = { currentQuestionIndex++ },
+                    onPreviousPressed = { questions.currentQuestionIndex-- },
+                    onNextPressed = { questions.currentQuestionIndex++ },
                     onDonePressed = onDonePressed
                 )
             }
@@ -158,7 +155,7 @@ private fun TopAppBarTitle(
         fontWeight = FontWeight.Bold
     )
     val totalStyle = MaterialTheme.typography.caption.toSpanStyle().copy(
-        fontWeight = FontWeight.SemiBold
+        fontWeight = FontWeight.Normal
     )
     val text = annotatedString {
         withStyle(style = indexStyle) {

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyState.kt

@@ -38,7 +38,9 @@ sealed class SurveyState {
     data class Questions(
         @StringRes val surveyTitle: Int,
         val questionsState: List<QuestionState>
-    ) : SurveyState()
+    ) : SurveyState() {
+        var currentQuestionIndex by mutableStateOf(0)
+    }
 
     data class Result(
         @StringRes val surveyTitle: Int,

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyViewModel.kt

@@ -84,7 +84,7 @@ class SurveyViewModel(private val surveyRepository: SurveyRepository) : ViewMode
     private fun getLatestQuestionId(): Int? {
         val latestState = _uiState.value
         if (latestState != null && latestState is SurveyState.Questions) {
-            return latestState.questionsState[0].question.id
+            return latestState.questionsState[latestState.currentQuestionIndex].question.id
         }
         return null
     }