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

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
Manually matched figma colors to theme
  • Loading branch information
@IanGClifton
IanGClifton committed Aug 19, 2022
commit d5c8d7922a0a840f73b3510e9a8449958ecf2241
45 changes: 22 additions & 23 deletions 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 @@ -22,27 +22,27 @@ val md_theme_light_primary = Color(0xFF8307F0)
val md_theme_light_onPrimary = Color(0xFFFFFFFF)
val md_theme_light_primaryContainer = Color(0xFFEEDCFF)
val md_theme_light_onPrimaryContainer = Color(0xFF2A0054)
val md_theme_light_secondary = Color(0xFF734C9E)
val md_theme_light_secondary = Color(0xFF655A6F)
val md_theme_light_onSecondary = Color(0xFFFFFFFF)
val md_theme_light_secondaryContainer = Color(0xFFEFDBFF)
val md_theme_light_onSecondaryContainer = Color(0xFF2B0052)
val md_theme_light_tertiary = Color(0xFF9B4055)
val md_theme_light_secondaryContainer = Color(0xFFEBDDF7)
val md_theme_light_onSecondaryContainer = Color(0xFF20182A)
val md_theme_light_tertiary = Color(0xFF80525A)
val md_theme_light_onTertiary = Color(0xFFFFFFFF)
val md_theme_light_tertiaryContainer = Color(0xFFFFD9DE)
val md_theme_light_onTertiaryContainer = Color(0xFF3F0015)
val md_theme_light_onTertiaryContainer = Color(0xFF321018)
val md_theme_light_error = Color(0xFFBA1A1A)
val md_theme_light_errorContainer = Color(0xFFFFDAD6)
val md_theme_light_onError = Color(0xFFFFFFFF)
val md_theme_light_onErrorContainer = Color(0xFF410002)
val md_theme_light_background = Color(0xFFFFFBFF)
val md_theme_light_onBackground = Color(0xFF2D004F)
val md_theme_light_onBackground = Color(0xFF1D1B1E)
val md_theme_light_surface = Color(0xFFFFFBFF)
val md_theme_light_onSurface = Color(0xFF2D004F)
val md_theme_light_onSurface = Color(0xFF1D1B1E)
val md_theme_light_surfaceVariant = Color(0xFFE8E0EB)
val md_theme_light_onSurfaceVariant = Color(0xFF4A454E)
val md_theme_light_outline = Color(0xFF7B757F)
val md_theme_light_inverseOnSurface = Color(0xFFFAECFF)
val md_theme_light_inverseSurface = Color(0xFF451969)
val md_theme_light_inverseOnSurface = Color(0xFFE7E1E5)
val md_theme_light_inverseSurface = Color(0xFF1D1B1E)
val md_theme_light_inversePrimary = Color(0xFFD9B9FF)
val md_theme_light_shadow = Color(0xFF000000)
val md_theme_light_surfaceTint = Color(0xFF8307F0)
Expand All @@ -51,30 +51,29 @@ val md_theme_dark_primary = Color(0xFFD9B9FF)
val md_theme_dark_onPrimary = Color(0xFF450085)
val md_theme_dark_primaryContainer = Color(0xFF6300BA)
val md_theme_dark_onPrimaryContainer = Color(0xFFEEDCFF)
val md_theme_dark_secondary = Color(0xFFDBB8FF)
val md_theme_dark_onSecondary = Color(0xFF421A6C)
val md_theme_dark_secondaryContainer = Color(0xFF5A3384)
val md_theme_dark_onSecondaryContainer = Color(0xFFEFDBFF)
val md_theme_dark_tertiary = Color(0xFFFFB2BE)
val md_theme_dark_onTertiary = Color(0xFF5F1128)
val md_theme_dark_tertiaryContainer = Color(0xFF7D293E)
val md_theme_dark_secondary = Color(0xFFCFC1DA)
val md_theme_dark_onSecondary = Color(0xFF352D40)
val md_theme_dark_secondaryContainer = Color(0xFF4C4357)
val md_theme_dark_onSecondaryContainer = Color(0xFFEBDDF7)
val md_theme_dark_tertiary = Color(0xFFF2B7C1)
val md_theme_dark_onTertiary = Color(0xFF4B252D)
val md_theme_dark_tertiaryContainer = Color(0xFF653B43)
val md_theme_dark_onTertiaryContainer = Color(0xFFFFD9DE)
val md_theme_dark_error = Color(0xFFFFB4AB)
val md_theme_dark_errorContainer = Color(0xFF93000A)
val md_theme_dark_onError = Color(0xFF690005)
val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
val md_theme_dark_background = Color(0xFF2D004F)
val md_theme_dark_onBackground = Color(0xFFF2DAFF)
val md_theme_dark_surface = Color(0xFF2D004F)
val md_theme_dark_onSurface = Color(0xFFF2DAFF)
val md_theme_dark_background = Color(0xFF1D1B1E)
val md_theme_dark_onBackground = Color(0xFFE7E1E5)
val md_theme_dark_surface = Color(0xFF1D1B1E)
val md_theme_dark_onSurface = Color(0xFFE7E1E5)
val md_theme_dark_surfaceVariant = Color(0xFF4A454E)
val md_theme_dark_onSurfaceVariant = Color(0xFFCCC4CF)
val md_theme_dark_outline = Color(0xFF958E99)
val md_theme_dark_inverseOnSurface = Color(0xFF2D004F)
val md_theme_dark_inverseSurface = Color(0xFFF2DAFF)
val md_theme_dark_inverseOnSurface = Color(0xFF1D1B1E)
val md_theme_dark_inverseSurface = Color(0xFFFFFBFF)
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)