Skip to content

[Jetsurvey] Update to 6953474 snapshot #269

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
florina-muntenescu merged 3 commits into from
Nov 6, 2020
Merged

[Jetsurvey] Update to 6953474 snapshot #269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e132b5
[Jetsurvey] Update to 6953474 snapshot
florina-muntenescu Nov 6, 2020
b88faed
[Jetsurvey] Removing ContentAlpha.high
florina-muntenescu Nov 6, 2020
3c14527
[Jetsurvey] Removing unneeded compiler args
florina-muntenescu Nov 6, 2020
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
Prev Previous commit
Next Next commit
[Jetsurvey] Removing ContentAlpha.high
  • Loading branch information
@florina-muntenescu
florina-muntenescu committed Nov 6, 2020
commit b88faedf3231e96c509f29670cf18defa394f055
14 changes: 6 additions & 8 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,12 @@ private fun Branding(modifier: Modifier = Modifier) {
modifier = modifier.wrapContentHeight(align = Alignment.CenterVertically)
) {
Logo(modifier = Modifier.align(Alignment.CenterHorizontally).padding(horizontal = 76.dp))
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = stringResource(id = R.string.app_tagline),
style = MaterialTheme.typography.subtitle1,
textAlign = TextAlign.Center,
modifier = Modifier.padding(top = 24.dp).fillMaxWidth()
)
}
Text(
text = stringResource(id = R.string.app_tagline),
style = MaterialTheme.typography.subtitle1,
textAlign = TextAlign.Center,
modifier = Modifier.padding(top = 24.dp).fillMaxWidth()
)
}
}

Expand Down
12 changes: 5 additions & 7 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,11 @@ fun Question(
shape = MaterialTheme.shapes.small
)
) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = stringResource(id = question.questionText),
style = MaterialTheme.typography.subtitle1,
modifier = Modifier.fillMaxWidth().padding(vertical = 24.dp, horizontal = 16.dp)
)
}
Text(
text = stringResource(id = question.questionText),
style = MaterialTheme.typography.subtitle1,
modifier = Modifier.fillMaxWidth().padding(vertical = 24.dp, horizontal = 16.dp)
)
}
Spacer(modifier = Modifier.preferredHeight(24.dp))
if (question.description != null) {
Expand Down