Rebase to include android#478

angeles-bilbao6 · angeles-bilbao6 · commit 906548920ae8 · 2021-04-22T08:46:09.000-05:00
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt
@@ -107,7 +107,7 @@ fun Question(
                         text = stringResource(id = question.description),
                         style = MaterialTheme.typography.caption,
                         modifier = Modifier
-                            .fillMaxWidth()
+                            .fillParentMaxWidth()
                             .padding(bottom = 18.dp, start = 8.dp, end = 8.dp)
                     )
                 }
@@ -117,7 +117,7 @@ fun Question(
                     possibleAnswer = question.answer,
                     answer = answer as Answer.SingleChoice?,
                     onAnswerSelected = { answer -> onAnswer(Answer.SingleChoice(answer)) },
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillParentMaxWidth()
                 )
                 is PossibleAnswer.MultipleChoice -> MultipleChoiceQuestion(
                     possibleAnswer = question.answer,
@@ -131,20 +131,20 @@ fun Question(
                             onAnswer(answer.withAnswerSelected(newAnswer, selected))
                         }
                     },
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillParentMaxWidth()
                 )
                 is PossibleAnswer.Action -> ActionQuestion(
                     questionId = question.id,
                     possibleAnswer = question.answer,
                     answer = answer as Answer.Action?,
                     onAction = onAction,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillParentMaxWidth()
                 )
                 is PossibleAnswer.Slider -> SliderQuestion(
                     possibleAnswer = question.answer,
                     answer = answer as Answer.Slider?,
                     onAnswerSelected = { onAnswer(Answer.Slider(it)) },
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillParentMaxWidth()
                 )
             }
         }
@@ -344,8 +344,8 @@ private fun PhotoQuestion(
                     painter = rememberCoilPainter(answer.result.uri, fadeIn = true),
                     contentDescription = null,
                     modifier = Modifier
+                        .fillMaxWidth()
                         .height(302.dp)
-                        .fillMaxWidth(),
                 )
             } else {
                 PhotoDefaultImage(modifier = Modifier.padding(horizontal = 86.dp, vertical = 74.dp))

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ fun Question(`
`107`	`107`	`text = stringResource(id = question.description),`
`108`	`108`	`style = MaterialTheme.typography.caption,`
`109`	`109`	`modifier = Modifier`
`110`		`- .fillMaxWidth()`
	`110`	`+ .fillParentMaxWidth()`
`111`	`111`	`.padding(bottom = 18.dp, start = 8.dp, end = 8.dp)`
`112`	`112`	`)`
`113`	`113`	`}`
`@@ -117,7 +117,7 @@ fun Question(`
`117`	`117`	`possibleAnswer = question.answer,`
`118`	`118`	`answer = answer as Answer.SingleChoice?,`
`119`	`119`	`onAnswerSelected = { answer -> onAnswer(Answer.SingleChoice(answer)) },`
`120`		`- modifier = Modifier.fillMaxWidth()`
	`120`	`+ modifier = Modifier.fillParentMaxWidth()`
`121`	`121`	`)`
`122`	`122`	`is PossibleAnswer.MultipleChoice -> MultipleChoiceQuestion(`
`123`	`123`	`possibleAnswer = question.answer,`
`@@ -131,20 +131,20 @@ fun Question(`
`131`	`131`	`onAnswer(answer.withAnswerSelected(newAnswer, selected))`
`132`	`132`	`}`
`133`	`133`	`},`
`134`		`- modifier = Modifier.fillMaxWidth()`
	`134`	`+ modifier = Modifier.fillParentMaxWidth()`
`135`	`135`	`)`
`136`	`136`	`is PossibleAnswer.Action -> ActionQuestion(`
`137`	`137`	`questionId = question.id,`
`138`	`138`	`possibleAnswer = question.answer,`
`139`	`139`	`answer = answer as Answer.Action?,`
`140`	`140`	`onAction = onAction,`
`141`		`- modifier = Modifier.fillMaxWidth()`
	`141`	`+ modifier = Modifier.fillParentMaxWidth()`
`142`	`142`	`)`
`143`	`143`	`is PossibleAnswer.Slider -> SliderQuestion(`
`144`	`144`	`possibleAnswer = question.answer,`
`145`	`145`	`answer = answer as Answer.Slider?,`
`146`	`146`	`onAnswerSelected = { onAnswer(Answer.Slider(it)) },`
`147`		`- modifier = Modifier.fillMaxWidth()`
	`147`	`+ modifier = Modifier.fillParentMaxWidth()`
`148`	`148`	`)`
`149`	`149`	`}`
`150`	`150`	`}`
`@@ -344,8 +344,8 @@ private fun PhotoQuestion(`
`344`	`344`	`painter = rememberCoilPainter(answer.result.uri, fadeIn = true),`
`345`	`345`	`contentDescription = null,`
`346`	`346`	`modifier = Modifier`
	`347`	`+ .fillMaxWidth()`
`347`	`348`	`.height(302.dp)`
`348`		`- .fillMaxWidth(),`
`349`	`349`	`)`
`350`	`350`	`} else {`
`351`	`351`	`PhotoDefaultImage(modifier = Modifier.padding(horizontal = 86.dp, vertical = 74.dp))`