Skip to content

[Jetsurvey] Converted to use Material 3 #954

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
merged 13 commits into from
Aug 30, 2022
Merged

[Jetsurvey] Converted to use Material 3 #954

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ea5fb18
Initial work for converting Jetsurvey to Material3
IanGClifton Aug 19, 2022
b23ff57
Jetsurvey components converted to m3
IanGClifton Aug 19, 2022
d5c8d79
Manually matched figma colors to theme
IanGClifton Aug 19, 2022
0360ddc
Removed m2 dependency
IanGClifton Aug 19, 2022
04f641f
Fixed toolbar and status bar
IanGClifton Aug 19, 2022
d202838
Additional tweaks to better match comps
IanGClifton Aug 19, 2022
1b349cc
Spotless fixes
IanGClifton Aug 19, 2022
2894c4e
Fixes for alpha constants, content color checks, etc.
IanGClifton Aug 22, 2022
3afa815
More polish fixes
IanGClifton Aug 22, 2022
b405543
Spotless fixes
IanGClifton Aug 22, 2022
9ee2e37
Merge branch 'main' into iangclifton/jetsurvey-m3
IanGClifton Aug 23, 2022
6f465ef
Updated screenshots/animated gif; PR feedback
IanGClifton Aug 26, 2022
ede93fc
Updated app theme to m3
IanGClifton Aug 29, 2022
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
Spotless fixes
  • Loading branch information
@IanGClifton
IanGClifton committed Aug 19, 2022
commit 1b349ccc880a494cff28f7bf12172291880a0f9b
2 changes: 1 addition & 1 deletion Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,4 @@ fun SignInPreview() {
JetsurveyTheme {
SignIn {}
}
}
}
2 changes: 1 addition & 1 deletion 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 @@ -185,4 +185,4 @@ fun WelcomeScreenPreview() {
JetsurveyTheme {
WelcomeScreen {}
}
}
}
4 changes: 2 additions & 2 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 @@ -813,7 +813,7 @@ fun PhotoQuestionPreview() {
fun DateQuestionPreview() {
JetsurveyTheme {
Surface {
DateQuestion(questionId = 1, answer = null, onAction = {_, _ -> })
DateQuestion(questionId = 1, answer = null, onAction = { _, _ -> })
}
}
}
}
4 changes: 2 additions & 2 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 @@ -199,9 +199,9 @@ private fun TopAppBarTitle(
totalQuestionsCount: Int,
modifier: Modifier = Modifier
) {
Row (modifier = modifier){
Row(modifier = modifier) {
Text(
text = (questionIndex+1).toString(),
text = (questionIndex + 1).toString(),
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
)
Expand Down
2 changes: 1 addition & 1 deletion Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ val md_theme_dark_inversePrimary = Color(0xFF8307F0)
val md_theme_dark_shadow = Color(0xFF000000)
val md_theme_dark_surfaceTint = Color(0xFFD9B9FF)

val seed = Color(0xFF8100EF)
val seed = Color(0xFF8100EF)
4 changes: 2 additions & 2 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 @@ -105,7 +105,7 @@ fun JetsurveyTheme(
md_theme_dark_surface
}

onDispose { }
onDispose { }
}

MaterialTheme(
Expand All @@ -117,4 +117,4 @@ fun JetsurveyTheme(
}

@Composable
fun surfaceIsLight(): Boolean = MaterialTheme.colorScheme.surface.luminance() > 0.5f
fun surfaceIsLight(): Boolean = MaterialTheme.colorScheme.surface.luminance() > 0.5f
2 changes: 1 addition & 1 deletion Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/theme/Typography.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,4 @@ val Typography = Typography(
lineHeight = 16.sp,
letterSpacing = 0.4.sp,
),
)
)