Skip to content

Commit

Permalink
WIP: Initial pass at updating the theme to Material 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@christianrowlands
christianrowlands committed Nov 1, 2024
1 parent cfcbb6f commit 79aae01
Show file tree
Hide file tree
Showing 7 changed files with 826 additions and 4 deletions.
218 changes: 217 additions & 1 deletion networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/Color.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,220 @@ val ColorBlack = Color(0xFF000000)
val ColorOffBlack = Color(0xFF161616)
val ColorWhiteCultured = Color(0xFFF4F4F4)
val ColorRedFieryRose = Color(0xFFF45B69)
val ColorBlueIceberg = Color(0xFF8BAED0)
val ColorBlueIceberg = Color(0xFF8BAED0)

val primaryLight = Color(0xFF0F6681)
val onPrimaryLight = Color(0xFFFFFFFF)
val primaryContainerLight = Color(0xFFBCE9FF)
val onPrimaryContainerLight = Color(0xFF001F29)
val secondaryLight = Color(0xFF4D616B)
val onSecondaryLight = Color(0xFFFFFFFF)
val secondaryContainerLight = Color(0xFFD0E6F2)
val onSecondaryContainerLight = Color(0xFF081E27)
val tertiaryLight = Color(0xFF116B56)
val onTertiaryLight = Color(0xFFFFFFFF)
val tertiaryContainerLight = Color(0xFFA3F2D8)
val onTertiaryContainerLight = Color(0xFF002018)
val errorLight = Color(0xFFBA1A1A)
val onErrorLight = Color(0xFFFFFFFF)
val errorContainerLight = Color(0xFFFFDAD6)
val onErrorContainerLight = Color(0xFF410002)
val backgroundLight = Color(0xFFF5FAFD)
val onBackgroundLight = Color(0xFF171C1F)
val surfaceLight = Color(0xFFF5FAFD)
val onSurfaceLight = Color(0xFF171C1F)
val surfaceVariantLight = Color(0xFFDCE4E9)
val onSurfaceVariantLight = Color(0xFF40484C)
val outlineLight = Color(0xFF70787D)
val outlineVariantLight = Color(0xFFC0C8CC)
val scrimLight = Color(0xFF000000)
val inverseSurfaceLight = Color(0xFF2C3134)
val inverseOnSurfaceLight = Color(0xFFEDF1F5)
val inversePrimaryLight = Color(0xFF8AD0EE)
val surfaceDimLight = Color(0xFFD6DBDE)
val surfaceBrightLight = Color(0xFFF5FAFD)
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
val surfaceContainerLowLight = Color(0xFFF0F4F8)
val surfaceContainerLight = Color(0xFFEAEEF2)
val surfaceContainerHighLight = Color(0xFFE4E9EC)
val surfaceContainerHighestLight = Color(0xFFDEE3E6)

val primaryLightMediumContrast = Color(0xFF00495E)
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
val primaryContainerLightMediumContrast = Color(0xFF327D99)
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val secondaryLightMediumContrast = Color(0xFF31464F)
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
val secondaryContainerLightMediumContrast = Color(0xFF637882)
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryLightMediumContrast = Color(0xFF004C3C)
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightMediumContrast = Color(0xFF31826C)
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val errorLightMediumContrast = Color(0xFF8C0009)
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
val errorContainerLightMediumContrast = Color(0xFFDA342E)
val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
val backgroundLightMediumContrast = Color(0xFFF5FAFD)
val onBackgroundLightMediumContrast = Color(0xFF171C1F)
val surfaceLightMediumContrast = Color(0xFFF5FAFD)
val onSurfaceLightMediumContrast = Color(0xFF171C1F)
val surfaceVariantLightMediumContrast = Color(0xFFDCE4E9)
val onSurfaceVariantLightMediumContrast = Color(0xFF3C4448)
val outlineLightMediumContrast = Color(0xFF586065)
val outlineVariantLightMediumContrast = Color(0xFF747C80)
val scrimLightMediumContrast = Color(0xFF000000)
val inverseSurfaceLightMediumContrast = Color(0xFF2C3134)
val inverseOnSurfaceLightMediumContrast = Color(0xFFEDF1F5)
val inversePrimaryLightMediumContrast = Color(0xFF8AD0EE)
val surfaceDimLightMediumContrast = Color(0xFFD6DBDE)
val surfaceBrightLightMediumContrast = Color(0xFFF5FAFD)
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightMediumContrast = Color(0xFFF0F4F8)
val surfaceContainerLightMediumContrast = Color(0xFFEAEEF2)
val surfaceContainerHighLightMediumContrast = Color(0xFFE4E9EC)
val surfaceContainerHighestLightMediumContrast = Color(0xFFDEE3E6)

val primaryLightHighContrast = Color(0xFF002632)
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
val primaryContainerLightHighContrast = Color(0xFF00495E)
val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
val secondaryLightHighContrast = Color(0xFF0F252D)
val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
val secondaryContainerLightHighContrast = Color(0xFF31464F)
val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
val tertiaryLightHighContrast = Color(0xFF00281E)
val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightHighContrast = Color(0xFF004C3C)
val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
val errorLightHighContrast = Color(0xFF4E0002)
val onErrorLightHighContrast = Color(0xFFFFFFFF)
val errorContainerLightHighContrast = Color(0xFF8C0009)
val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
val backgroundLightHighContrast = Color(0xFFF5FAFD)
val onBackgroundLightHighContrast = Color(0xFF171C1F)
val surfaceLightHighContrast = Color(0xFFF5FAFD)
val onSurfaceLightHighContrast = Color(0xFF000000)
val surfaceVariantLightHighContrast = Color(0xFFDCE4E9)
val onSurfaceVariantLightHighContrast = Color(0xFF1D2529)
val outlineLightHighContrast = Color(0xFF3C4448)
val outlineVariantLightHighContrast = Color(0xFF3C4448)
val scrimLightHighContrast = Color(0xFF000000)
val inverseSurfaceLightHighContrast = Color(0xFF2C3134)
val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
val inversePrimaryLightHighContrast = Color(0xFFD4F0FF)
val surfaceDimLightHighContrast = Color(0xFFD6DBDE)
val surfaceBrightLightHighContrast = Color(0xFFF5FAFD)
val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightHighContrast = Color(0xFFF0F4F8)
val surfaceContainerLightHighContrast = Color(0xFFEAEEF2)
val surfaceContainerHighLightHighContrast = Color(0xFFE4E9EC)
val surfaceContainerHighestLightHighContrast = Color(0xFFDEE3E6)

val primaryDark = Color(0xFF8AD0EE)
val onPrimaryDark = Color(0xFF003545)
val primaryContainerDark = Color(0xFF004D63)
val onPrimaryContainerDark = Color(0xFFBCE9FF)
val secondaryDark = Color(0xFFB4CAD5)
val onSecondaryDark = Color(0xFF1E333C)
val secondaryContainerDark = Color(0xFF354A53)
val onSecondaryContainerDark = Color(0xFFD0E6F2)
val tertiaryDark = Color(0xFF87D6BC)
val onTertiaryDark = Color(0xFF00382C)
val tertiaryContainerDark = Color(0xFF005140)
val onTertiaryContainerDark = Color(0xFFA3F2D8)
val errorDark = Color(0xFFFFB4AB)
val onErrorDark = Color(0xFF690005)
val errorContainerDark = Color(0xFF93000A)
val onErrorContainerDark = Color(0xFFFFDAD6)
val backgroundDark = Color(0xFF0F1417)
val onBackgroundDark = Color(0xFFDEE3E6)
val surfaceDark = Color(0xFF0F1417)
val onSurfaceDark = Color(0xFFDEE3E6)
val surfaceVariantDark = Color(0xFF40484C)
val onSurfaceVariantDark = Color(0xFFC0C8CC)
val outlineDark = Color(0xFF8A9296)
val outlineVariantDark = Color(0xFF40484C)
val scrimDark = Color(0xFF000000)
val inverseSurfaceDark = Color(0xFFDEE3E6)
val inverseOnSurfaceDark = Color(0xFF2C3134)
val inversePrimaryDark = Color(0xFF0F6681)
val surfaceDimDark = Color(0xFF0F1417)
val surfaceBrightDark = Color(0xFF353A3D)
val surfaceContainerLowestDark = Color(0xFF0A0F11)
val surfaceContainerLowDark = Color(0xFF171C1F)
val surfaceContainerDark = Color(0xFF1B2023)
val surfaceContainerHighDark = Color(0xFF262B2D)
val surfaceContainerHighestDark = Color(0xFF303538)

val primaryDarkMediumContrast = Color(0xFF8ED4F3)
val onPrimaryDarkMediumContrast = Color(0xFF001922)
val primaryContainerDarkMediumContrast = Color(0xFF5299B6)
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
val secondaryDarkMediumContrast = Color(0xFFB8CEDA)
val onSecondaryDarkMediumContrast = Color(0xFF031921)
val secondaryContainerDarkMediumContrast = Color(0xFF7E949F)
val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
val tertiaryDarkMediumContrast = Color(0xFF8BDAC1)
val onTertiaryDarkMediumContrast = Color(0xFF001B13)
val tertiaryContainerDarkMediumContrast = Color(0xFF509F88)
val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
val errorDarkMediumContrast = Color(0xFFFFBAB1)
val onErrorDarkMediumContrast = Color(0xFF370001)
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
val onErrorContainerDarkMediumContrast = Color(0xFF000000)
val backgroundDarkMediumContrast = Color(0xFF0F1417)
val onBackgroundDarkMediumContrast = Color(0xFFDEE3E6)
val surfaceDarkMediumContrast = Color(0xFF0F1417)
val onSurfaceDarkMediumContrast = Color(0xFFF7FBFF)
val surfaceVariantDarkMediumContrast = Color(0xFF40484C)
val onSurfaceVariantDarkMediumContrast = Color(0xFFC4CCD1)
val outlineDarkMediumContrast = Color(0xFF9CA4A9)
val outlineVariantDarkMediumContrast = Color(0xFF7C8489)
val scrimDarkMediumContrast = Color(0xFF000000)
val inverseSurfaceDarkMediumContrast = Color(0xFFDEE3E6)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF262B2D)
val inversePrimaryDarkMediumContrast = Color(0xFF004E65)
val surfaceDimDarkMediumContrast = Color(0xFF0F1417)
val surfaceBrightDarkMediumContrast = Color(0xFF353A3D)
val surfaceContainerLowestDarkMediumContrast = Color(0xFF0A0F11)
val surfaceContainerLowDarkMediumContrast = Color(0xFF171C1F)
val surfaceContainerDarkMediumContrast = Color(0xFF1B2023)
val surfaceContainerHighDarkMediumContrast = Color(0xFF262B2D)
val surfaceContainerHighestDarkMediumContrast = Color(0xFF303538)

val primaryDarkHighContrast = Color(0xFFF6FBFF)
val onPrimaryDarkHighContrast = Color(0xFF000000)
val primaryContainerDarkHighContrast = Color(0xFF8ED4F3)
val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
val secondaryDarkHighContrast = Color(0xFFF6FBFF)
val onSecondaryDarkHighContrast = Color(0xFF000000)
val secondaryContainerDarkHighContrast = Color(0xFFB8CEDA)
val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
val tertiaryDarkHighContrast = Color(0xFFECFFF6)
val onTertiaryDarkHighContrast = Color(0xFF000000)
val tertiaryContainerDarkHighContrast = Color(0xFF8BDAC1)
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
val errorDarkHighContrast = Color(0xFFFFF9F9)
val onErrorDarkHighContrast = Color(0xFF000000)
val errorContainerDarkHighContrast = Color(0xFFFFBAB1)
val onErrorContainerDarkHighContrast = Color(0xFF000000)
val backgroundDarkHighContrast = Color(0xFF0F1417)
val onBackgroundDarkHighContrast = Color(0xFFDEE3E6)
val surfaceDarkHighContrast = Color(0xFF0F1417)
val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
val surfaceVariantDarkHighContrast = Color(0xFF40484C)
val onSurfaceVariantDarkHighContrast = Color(0xFFF6FBFF)
val outlineDarkHighContrast = Color(0xFFC4CCD1)
val outlineVariantDarkHighContrast = Color(0xFFC4CCD1)
val scrimDarkHighContrast = Color(0xFF000000)
val inverseSurfaceDarkHighContrast = Color(0xFFDEE3E6)
val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
val inversePrimaryDarkHighContrast = Color(0xFF002E3D)
val surfaceDimDarkHighContrast = Color(0xFF0F1417)
val surfaceBrightDarkHighContrast = Color(0xFF353A3D)
val surfaceContainerLowestDarkHighContrast = Color(0xFF0A0F11)
val surfaceContainerLowDarkHighContrast = Color(0xFF171C1F)
val surfaceContainerDarkHighContrast = Color(0xFF1B2023)
val surfaceContainerHighDarkHighContrast = Color(0xFF262B2D)
val surfaceContainerHighestDarkHighContrast = Color(0xFF303538)
2 changes: 1 addition & 1 deletion networksurvey/src/main/java/com/craxiom/networksurvey/ui/theme/NsTheme.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private val LightColorScheme = lightColorScheme(
)

@Composable
fun NsTheme(
fun OldNsTheme(
darkTheme: Boolean = true,
content: @Composable () -> Unit
) {
Expand Down
Loading

0 comments on commit 79aae01

Please sign in to comment.