Skip to content

[Jetsurvey] Redesigning single and multiple choice questions #265

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 6 commits into from
Nov 4, 2020
Merged

[Jetsurvey] Redesigning single and multiple choice questions #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4354d04
[Jetsurvey] Styling the questions progress indicator
florina-muntenescu Oct 28, 2020
d75e4c1
[Jetsurvey] Styling Single and Multiple choice questions
florina-muntenescu Oct 31, 2020
77e548d
[Jetsurvey] Adding question description
florina-muntenescu Oct 31, 2020
8cec984
[Jetsurvey] Setting correct border and background colors
florina-muntenescu Nov 2, 2020
13d04f3
[Jetsurvey] Make the entire Row clickable
florina-muntenescu Nov 2, 2020
b2b8816
[Jetsurvey] Adding end padding to description
florina-muntenescu Nov 4, 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] Setting correct border and background colors
  • Loading branch information
@florina-muntenescu
florina-muntenescu committed Nov 2, 2020
commit 8cec9845cd6c15f7b31854d9226eb85a0c69d8aa
12 changes: 8 additions & 4 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 @@ -52,7 +52,6 @@ import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import com.example.compose.jetsurvey.R
import com.example.compose.jetsurvey.theme.JetsurveyTheme
import com.example.compose.jetsurvey.theme.questionBackground

@Composable
fun Question(
Expand All @@ -67,9 +66,14 @@ fun Question(
contentPadding = PaddingValues(start = 20.dp, end = 20.dp)
) {
Spacer(modifier = Modifier.preferredHeight(44.dp))
val backgroundColor = if (MaterialTheme.colors.isLight) {
MaterialTheme.colors.onSurface.copy(alpha = 0.04f)
} else {
MaterialTheme.colors.onSurface.copy(alpha = 0.06f)
}
Row(
modifier = Modifier.fillMaxWidth().background(
color = MaterialTheme.colors.questionBackground,
color = backgroundColor,
shape = MaterialTheme.shapes.small
)
) {
Expand Down Expand Up @@ -160,7 +164,7 @@ private fun SingleChoiceQuestion(
shape = MaterialTheme.shapes.small,
border = BorderStroke(
width = 1.dp,
color = MaterialTheme.colors.surface.copy(alpha = 0.12f)
color = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
),
modifier = Modifier.padding(vertical = 8.dp)
) {
Expand Down Expand Up @@ -210,7 +214,7 @@ private fun MultipleChoiceQuestion(
shape = MaterialTheme.shapes.small,
border = BorderStroke(
width = 1.dp,
color = MaterialTheme.colors.surface.copy(alpha = 0.12f)
color = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
),
modifier = Modifier.padding(vertical = 4.dp)
) {
Expand Down
4 changes: 0 additions & 4 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ val Colors.snackbarAction: Color
val Colors.progressIndicatorBackground: Color
get() = if (isLight) Color.Black.copy(alpha = 0.12f) else Color.Black.copy(alpha = 0.24f)

@Composable
val Colors.questionBackground: Color
get() = if (isLight) Gray100 else Gray900

@Composable
fun JetsurveyTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) {
val colors = if (darkTheme) {
Expand Down