From de257a59404f5d72d372bf1f05877378f1b1efc8 Mon Sep 17 00:00:00 2001 From: Martin Felber <45291671+FelberMartin@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:10:39 +0100 Subject: [PATCH] `Chore`: Update Material3 theme using "Color match" feature (#244) --- .../native_app/android/ui/theme/Color.kt | 265 ++++++++---------- .../native_app/android/ui/theme/Theme.kt | 60 +--- 2 files changed, 122 insertions(+), 203 deletions(-) diff --git a/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Color.kt b/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Color.kt index 6312fb315..0776a33a5 100644 --- a/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Color.kt +++ b/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Color.kt @@ -1,126 +1,127 @@ package de.tum.informatics.www1.artemis.native_app.android.ui.theme + import androidx.compose.ui.graphics.Color -val primaryLight = Color(0xFF2C638B) +val primaryLight = Color(0xFF005388) val onPrimaryLight = Color(0xFFFFFFFF) -val primaryContainerLight = Color(0xFFCCE5FF) -val onPrimaryContainerLight = Color(0xFF001D31) -val secondaryLight = Color(0xFF51606F) +val primaryContainerLight = Color(0xFF2779BA) +val onPrimaryContainerLight = Color(0xFFFFFFFF) +val secondaryLight = Color(0xFF48607B) val onSecondaryLight = Color(0xFFFFFFFF) -val secondaryContainerLight = Color(0xFFD4E4F6) -val onSecondaryContainerLight = Color(0xFF0D1D2A) -val tertiaryLight = Color(0xFF67587A) +val secondaryContainerLight = Color(0xFFCDE3FF) +val onSecondaryContainerLight = Color(0xFF314962) +val tertiaryLight = Color(0xFF713983) val onTertiaryLight = Color(0xFFFFFFFF) -val tertiaryContainerLight = Color(0xFFEDDCFF) -val onTertiaryContainerLight = Color(0xFF221533) +val tertiaryContainerLight = Color(0xFF995EAA) +val onTertiaryContainerLight = Color(0xFFFFFFFF) val errorLight = Color(0xFFBA1A1A) val onErrorLight = Color(0xFFFFFFFF) val errorContainerLight = Color(0xFFFFDAD6) val onErrorContainerLight = Color(0xFF410002) -val backgroundLight = Color(0xFFF7F9FF) -val onBackgroundLight = Color(0xFF181C20) -val surfaceLight = Color(0xFFF7F9FF) -val onSurfaceLight = Color(0xFF181C20) -val surfaceVariantLight = Color(0xFFDEE3EB) -val onSurfaceVariantLight = Color(0xFF42474E) -val outlineLight = Color(0xFF72787E) -val outlineVariantLight = Color(0xFFC2C7CE) +val backgroundLight = Color(0xFFF8F9FF) +val onBackgroundLight = Color(0xFF191C20) +val surfaceLight = Color(0xFFF8F9FF) +val onSurfaceLight = Color(0xFF191C20) +val surfaceVariantLight = Color(0xFFDCE3EE) +val onSurfaceVariantLight = Color(0xFF404750) +val outlineLight = Color(0xFF717881) +val outlineVariantLight = Color(0xFFC0C7D2) val scrimLight = Color(0xFF000000) val inverseSurfaceLight = Color(0xFF2D3135) -val inverseOnSurfaceLight = Color(0xFFEEF1F6) -val inversePrimaryLight = Color(0xFF99CCFA) -val surfaceDimLight = Color(0xFFD7DADF) -val surfaceBrightLight = Color(0xFFF7F9FF) +val inverseOnSurfaceLight = Color(0xFFEFF1F6) +val inversePrimaryLight = Color(0xFF9ACBFF) +val surfaceDimLight = Color(0xFFD8DAE0) +val surfaceBrightLight = Color(0xFFF8F9FF) val surfaceContainerLowestLight = Color(0xFFFFFFFF) -val surfaceContainerLowLight = Color(0xFFF1F4F9) -val surfaceContainerLight = Color(0xFFEBEEF3) +val surfaceContainerLowLight = Color(0xFFF2F3F9) +val surfaceContainerLight = Color(0xFFECEEF4) val surfaceContainerHighLight = Color(0xFFE6E8EE) val surfaceContainerHighestLight = Color(0xFFE0E2E8) -val primaryLightMediumContrast = Color(0xFF00476D) +val primaryLightMediumContrast = Color(0xFF004673) val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) -val primaryContainerLightMediumContrast = Color(0xFF4579A3) +val primaryContainerLightMediumContrast = Color(0xFF2779BA) val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val secondaryLightMediumContrast = Color(0xFF354453) +val secondaryLightMediumContrast = Color(0xFF2C455E) val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) -val secondaryContainerLightMediumContrast = Color(0xFF677686) +val secondaryContainerLightMediumContrast = Color(0xFF5E7792) val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryLightMediumContrast = Color(0xFF4A3D5D) +val tertiaryLightMediumContrast = Color(0xFF622B74) val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightMediumContrast = Color(0xFF7E6E92) +val tertiaryContainerLightMediumContrast = Color(0xFF995EAA) val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) val errorLightMediumContrast = Color(0xFF8C0009) val onErrorLightMediumContrast = Color(0xFFFFFFFF) val errorContainerLightMediumContrast = Color(0xFFDA342E) val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) -val backgroundLightMediumContrast = Color(0xFFF7F9FF) -val onBackgroundLightMediumContrast = Color(0xFF181C20) -val surfaceLightMediumContrast = Color(0xFFF7F9FF) -val onSurfaceLightMediumContrast = Color(0xFF181C20) -val surfaceVariantLightMediumContrast = Color(0xFFDEE3EB) -val onSurfaceVariantLightMediumContrast = Color(0xFF3E434A) -val outlineLightMediumContrast = Color(0xFF5A6066) -val outlineVariantLightMediumContrast = Color(0xFF767B82) +val backgroundLightMediumContrast = Color(0xFFF8F9FF) +val onBackgroundLightMediumContrast = Color(0xFF191C20) +val surfaceLightMediumContrast = Color(0xFFF8F9FF) +val onSurfaceLightMediumContrast = Color(0xFF191C20) +val surfaceVariantLightMediumContrast = Color(0xFFDCE3EE) +val onSurfaceVariantLightMediumContrast = Color(0xFF3D434C) +val outlineLightMediumContrast = Color(0xFF596069) +val outlineVariantLightMediumContrast = Color(0xFF747B85) val scrimLightMediumContrast = Color(0xFF000000) val inverseSurfaceLightMediumContrast = Color(0xFF2D3135) -val inverseOnSurfaceLightMediumContrast = Color(0xFFEEF1F6) -val inversePrimaryLightMediumContrast = Color(0xFF99CCFA) -val surfaceDimLightMediumContrast = Color(0xFFD7DADF) -val surfaceBrightLightMediumContrast = Color(0xFFF7F9FF) +val inverseOnSurfaceLightMediumContrast = Color(0xFFEFF1F6) +val inversePrimaryLightMediumContrast = Color(0xFF9ACBFF) +val surfaceDimLightMediumContrast = Color(0xFFD8DAE0) +val surfaceBrightLightMediumContrast = Color(0xFFF8F9FF) val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightMediumContrast = Color(0xFFF1F4F9) -val surfaceContainerLightMediumContrast = Color(0xFFEBEEF3) +val surfaceContainerLowLightMediumContrast = Color(0xFFF2F3F9) +val surfaceContainerLightMediumContrast = Color(0xFFECEEF4) val surfaceContainerHighLightMediumContrast = Color(0xFFE6E8EE) val surfaceContainerHighestLightMediumContrast = Color(0xFFE0E2E8) -val primaryLightHighContrast = Color(0xFF00243C) +val primaryLightHighContrast = Color(0xFF00243F) val onPrimaryLightHighContrast = Color(0xFFFFFFFF) -val primaryContainerLightHighContrast = Color(0xFF00476D) +val primaryContainerLightHighContrast = Color(0xFF004673) val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) -val secondaryLightHighContrast = Color(0xFF142431) +val secondaryLightHighContrast = Color(0xFF07243B) val onSecondaryLightHighContrast = Color(0xFFFFFFFF) -val secondaryContainerLightHighContrast = Color(0xFF354453) +val secondaryContainerLightHighContrast = Color(0xFF2C455E) val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) -val tertiaryLightHighContrast = Color(0xFF291C3B) +val tertiaryLightHighContrast = Color(0xFF3D0150) val onTertiaryLightHighContrast = Color(0xFFFFFFFF) -val tertiaryContainerLightHighContrast = Color(0xFF4A3D5D) +val tertiaryContainerLightHighContrast = Color(0xFF622B74) val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) val errorLightHighContrast = Color(0xFF4E0002) val onErrorLightHighContrast = Color(0xFFFFFFFF) val errorContainerLightHighContrast = Color(0xFF8C0009) val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) -val backgroundLightHighContrast = Color(0xFFF7F9FF) -val onBackgroundLightHighContrast = Color(0xFF181C20) -val surfaceLightHighContrast = Color(0xFFF7F9FF) +val backgroundLightHighContrast = Color(0xFFF8F9FF) +val onBackgroundLightHighContrast = Color(0xFF191C20) +val surfaceLightHighContrast = Color(0xFFF8F9FF) val onSurfaceLightHighContrast = Color(0xFF000000) -val surfaceVariantLightHighContrast = Color(0xFFDEE3EB) -val onSurfaceVariantLightHighContrast = Color(0xFF1F242A) -val outlineLightHighContrast = Color(0xFF3E434A) -val outlineVariantLightHighContrast = Color(0xFF3E434A) +val surfaceVariantLightHighContrast = Color(0xFFDCE3EE) +val onSurfaceVariantLightHighContrast = Color(0xFF1E242C) +val outlineLightHighContrast = Color(0xFF3D434C) +val outlineVariantLightHighContrast = Color(0xFF3D434C) val scrimLightHighContrast = Color(0xFF000000) val inverseSurfaceLightHighContrast = Color(0xFF2D3135) val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) -val inversePrimaryLightHighContrast = Color(0xFFDFEEFF) -val surfaceDimLightHighContrast = Color(0xFFD7DADF) -val surfaceBrightLightHighContrast = Color(0xFFF7F9FF) +val inversePrimaryLightHighContrast = Color(0xFFE1EDFF) +val surfaceDimLightHighContrast = Color(0xFFD8DAE0) +val surfaceBrightLightHighContrast = Color(0xFFF8F9FF) val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) -val surfaceContainerLowLightHighContrast = Color(0xFFF1F4F9) -val surfaceContainerLightHighContrast = Color(0xFFEBEEF3) +val surfaceContainerLowLightHighContrast = Color(0xFFF2F3F9) +val surfaceContainerLightHighContrast = Color(0xFFECEEF4) val surfaceContainerHighLightHighContrast = Color(0xFFE6E8EE) val surfaceContainerHighestLightHighContrast = Color(0xFFE0E2E8) -val primaryDark = Color(0xFF99CCFA) -val onPrimaryDark = Color(0xFF003351) -val primaryContainerDark = Color(0xFF084B72) -val onPrimaryContainerDark = Color(0xFFCCE5FF) -val secondaryDark = Color(0xFFB8C8DA) -val onSecondaryDark = Color(0xFF23323F) -val secondaryContainerDark = Color(0xFF394857) -val onSecondaryContainerDark = Color(0xFFD4E4F6) -val tertiaryDark = Color(0xFFD2BFE7) -val onTertiaryDark = Color(0xFF372A4A) -val tertiaryContainerDark = Color(0xFF4E4161) -val onTertiaryContainerDark = Color(0xFFEDDCFF) +val primaryDark = Color(0xFF9ACBFF) +val onPrimaryDark = Color(0xFF003355) +val primaryContainerDark = Color(0xFF2779BA) +val onPrimaryContainerDark = Color(0xFFFFFFFF) +val secondaryDark = Color(0xFFB0C9E7) +val onSecondaryDark = Color(0xFF18324A) +val secondaryContainerDark = Color(0xFF263F58) +val onSecondaryContainerDark = Color(0xFFBAD3F2) +val tertiaryDark = Color(0xFFF0B0FF) +val onTertiaryDark = Color(0xFF4D1560) +val tertiaryContainerDark = Color(0xFF995EAA) +val onTertiaryContainerDark = Color(0xFFFFFFFF) val errorDark = Color(0xFFFFB4AB) val onErrorDark = Color(0xFF690005) val errorContainerDark = Color(0xFF93000A) @@ -129,33 +130,33 @@ val backgroundDark = Color(0xFF101418) val onBackgroundDark = Color(0xFFE0E2E8) val surfaceDark = Color(0xFF101418) val onSurfaceDark = Color(0xFFE0E2E8) -val surfaceVariantDark = Color(0xFF42474E) -val onSurfaceVariantDark = Color(0xFFC2C7CE) -val outlineDark = Color(0xFF8C9198) -val outlineVariantDark = Color(0xFF42474E) +val surfaceVariantDark = Color(0xFF404750) +val onSurfaceVariantDark = Color(0xFFC0C7D2) +val outlineDark = Color(0xFF8A919B) +val outlineVariantDark = Color(0xFF404750) val scrimDark = Color(0xFF000000) val inverseSurfaceDark = Color(0xFFE0E2E8) val inverseOnSurfaceDark = Color(0xFF2D3135) -val inversePrimaryDark = Color(0xFF2C638B) +val inversePrimaryDark = Color(0xFF00629F) val surfaceDimDark = Color(0xFF101418) val surfaceBrightDark = Color(0xFF36393E) -val surfaceContainerLowestDark = Color(0xFF0B0F12) -val surfaceContainerLowDark = Color(0xFF181C20) -val surfaceContainerDark = Color(0xFF1C2024) -val surfaceContainerHighDark = Color(0xFF272A2E) -val surfaceContainerHighestDark = Color(0xFF313539) +val surfaceContainerLowestDark = Color(0xFF0B0E12) +val surfaceContainerLowDark = Color(0xFF191C20) +val surfaceContainerDark = Color(0xFF1D2024) +val surfaceContainerHighDark = Color(0xFF272A2F) +val surfaceContainerHighestDark = Color(0xFF32353A) -val primaryDarkMediumContrast = Color(0xFF9DD0FE) -val onPrimaryDarkMediumContrast = Color(0xFF001829) -val primaryContainerDarkMediumContrast = Color(0xFF6395C1) +val primaryDarkMediumContrast = Color(0xFFA3CFFF) +val onPrimaryDarkMediumContrast = Color(0xFF00182C) +val primaryContainerDarkMediumContrast = Color(0xFF4C95D8) val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) -val secondaryDarkMediumContrast = Color(0xFFBDCCDE) -val onSecondaryDarkMediumContrast = Color(0xFF071824) -val secondaryContainerDarkMediumContrast = Color(0xFF8392A3) +val secondaryDarkMediumContrast = Color(0xFFB4CDEB) +val onSecondaryDarkMediumContrast = Color(0xFF00182C) +val secondaryContainerDarkMediumContrast = Color(0xFF7A93AF) val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) -val tertiaryDarkMediumContrast = Color(0xFFD6C3EB) -val onTertiaryDarkMediumContrast = Color(0xFF1C102E) -val tertiaryContainerDarkMediumContrast = Color(0xFF9A8AAF) +val tertiaryDarkMediumContrast = Color(0xFFF1B6FF) +val onTertiaryDarkMediumContrast = Color(0xFF2B003A) +val tertiaryContainerDarkMediumContrast = Color(0xFFB879C8) val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) val errorDarkMediumContrast = Color(0xFFFFBAB1) val onErrorDarkMediumContrast = Color(0xFF370001) @@ -164,34 +165,34 @@ val onErrorContainerDarkMediumContrast = Color(0xFF000000) val backgroundDarkMediumContrast = Color(0xFF101418) val onBackgroundDarkMediumContrast = Color(0xFFE0E2E8) val surfaceDarkMediumContrast = Color(0xFF101418) -val onSurfaceDarkMediumContrast = Color(0xFFF9FBFF) -val surfaceVariantDarkMediumContrast = Color(0xFF42474E) -val onSurfaceVariantDarkMediumContrast = Color(0xFFC6CBD3) -val outlineDarkMediumContrast = Color(0xFF9EA3AB) -val outlineVariantDarkMediumContrast = Color(0xFF7E848B) +val onSurfaceDarkMediumContrast = Color(0xFFFAFAFF) +val surfaceVariantDarkMediumContrast = Color(0xFF404750) +val onSurfaceVariantDarkMediumContrast = Color(0xFFC5CBD6) +val outlineDarkMediumContrast = Color(0xFF9DA3AE) +val outlineVariantDarkMediumContrast = Color(0xFF7D848D) val scrimDarkMediumContrast = Color(0xFF000000) val inverseSurfaceDarkMediumContrast = Color(0xFFE0E2E8) -val inverseOnSurfaceDarkMediumContrast = Color(0xFF272A2E) -val inversePrimaryDarkMediumContrast = Color(0xFF0A4C73) +val inverseOnSurfaceDarkMediumContrast = Color(0xFF272A2F) +val inversePrimaryDarkMediumContrast = Color(0xFF004B7B) val surfaceDimDarkMediumContrast = Color(0xFF101418) val surfaceBrightDarkMediumContrast = Color(0xFF36393E) -val surfaceContainerLowestDarkMediumContrast = Color(0xFF0B0F12) -val surfaceContainerLowDarkMediumContrast = Color(0xFF181C20) -val surfaceContainerDarkMediumContrast = Color(0xFF1C2024) -val surfaceContainerHighDarkMediumContrast = Color(0xFF272A2E) -val surfaceContainerHighestDarkMediumContrast = Color(0xFF313539) +val surfaceContainerLowestDarkMediumContrast = Color(0xFF0B0E12) +val surfaceContainerLowDarkMediumContrast = Color(0xFF191C20) +val surfaceContainerDarkMediumContrast = Color(0xFF1D2024) +val surfaceContainerHighDarkMediumContrast = Color(0xFF272A2F) +val surfaceContainerHighestDarkMediumContrast = Color(0xFF32353A) -val primaryDarkHighContrast = Color(0xFFF9FBFF) +val primaryDarkHighContrast = Color(0xFFFAFAFF) val onPrimaryDarkHighContrast = Color(0xFF000000) -val primaryContainerDarkHighContrast = Color(0xFF9DD0FE) +val primaryContainerDarkHighContrast = Color(0xFFA3CFFF) val onPrimaryContainerDarkHighContrast = Color(0xFF000000) -val secondaryDarkHighContrast = Color(0xFFF9FBFF) +val secondaryDarkHighContrast = Color(0xFFFAFAFF) val onSecondaryDarkHighContrast = Color(0xFF000000) -val secondaryContainerDarkHighContrast = Color(0xFFBDCCDE) +val secondaryContainerDarkHighContrast = Color(0xFFB4CDEB) val onSecondaryContainerDarkHighContrast = Color(0xFF000000) -val tertiaryDarkHighContrast = Color(0xFFFFF9FD) +val tertiaryDarkHighContrast = Color(0xFFFFF9FA) val onTertiaryDarkHighContrast = Color(0xFF000000) -val tertiaryContainerDarkHighContrast = Color(0xFFD6C3EB) +val tertiaryContainerDarkHighContrast = Color(0xFFF1B6FF) val onTertiaryContainerDarkHighContrast = Color(0xFF000000) val errorDarkHighContrast = Color(0xFFFFF9F9) val onErrorDarkHighContrast = Color(0xFF000000) @@ -201,49 +202,25 @@ val backgroundDarkHighContrast = Color(0xFF101418) val onBackgroundDarkHighContrast = Color(0xFFE0E2E8) val surfaceDarkHighContrast = Color(0xFF101418) val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) -val surfaceVariantDarkHighContrast = Color(0xFF42474E) -val onSurfaceVariantDarkHighContrast = Color(0xFFF9FBFF) -val outlineDarkHighContrast = Color(0xFFC6CBD3) -val outlineVariantDarkHighContrast = Color(0xFFC6CBD3) +val surfaceVariantDarkHighContrast = Color(0xFF404750) +val onSurfaceVariantDarkHighContrast = Color(0xFFFAFAFF) +val outlineDarkHighContrast = Color(0xFFC5CBD6) +val outlineVariantDarkHighContrast = Color(0xFFC5CBD6) val scrimDarkHighContrast = Color(0xFF000000) val inverseSurfaceDarkHighContrast = Color(0xFFE0E2E8) val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) -val inversePrimaryDarkHighContrast = Color(0xFF002D47) +val inversePrimaryDarkHighContrast = Color(0xFF002C4B) val surfaceDimDarkHighContrast = Color(0xFF101418) val surfaceBrightDarkHighContrast = Color(0xFF36393E) -val surfaceContainerLowestDarkHighContrast = Color(0xFF0B0F12) -val surfaceContainerLowDarkHighContrast = Color(0xFF181C20) -val surfaceContainerDarkHighContrast = Color(0xFF1C2024) -val surfaceContainerHighDarkHighContrast = Color(0xFF272A2E) -val surfaceContainerHighestDarkHighContrast = Color(0xFF313539) +val surfaceContainerLowestDarkHighContrast = Color(0xFF0B0E12) +val surfaceContainerLowDarkHighContrast = Color(0xFF191C20) +val surfaceContainerDarkHighContrast = Color(0xFF1D2024) +val surfaceContainerHighDarkHighContrast = Color(0xFF272A2F) +val surfaceContainerHighestDarkHighContrast = Color(0xFF32353A) -val customColorLight = Color(0xFF3A608F) -val onCustomColorLight = Color(0xFFFFFFFF) -val customColorContainerLight = Color(0xFFD3E3FF) -val onCustomColorContainerLight = Color(0xFF001C39) -val customColorLightMediumContrast = Color(0xFF1B4472) -val onCustomColorLightMediumContrast = Color(0xFFFFFFFF) -val customColorContainerLightMediumContrast = Color(0xFF5276A7) -val onCustomColorContainerLightMediumContrast = Color(0xFFFFFFFF) -val customColorLightHighContrast = Color(0xFF002344) -val onCustomColorLightHighContrast = Color(0xFFFFFFFF) -val customColorContainerLightHighContrast = Color(0xFF1B4472) -val onCustomColorContainerLightHighContrast = Color(0xFFFFFFFF) -val customColorDark = Color(0xFFA4C9FE) -val onCustomColorDark = Color(0xFF00315D) -val customColorContainerDark = Color(0xFF204876) -val onCustomColorContainerDark = Color(0xFFD3E3FF) -val customColorDarkMediumContrast = Color(0xFFABCDFF) -val onCustomColorDarkMediumContrast = Color(0xFF001730) -val customColorContainerDarkMediumContrast = Color(0xFF6E93C5) -val onCustomColorContainerDarkMediumContrast = Color(0xFF000000) -val customColorDarkHighContrast = Color(0xFFFBFAFF) -val onCustomColorDarkHighContrast = Color(0xFF000000) -val customColorContainerDarkHighContrast = Color(0xFFABCDFF) -val onCustomColorContainerDarkHighContrast = Color(0xFF000000) diff --git a/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Theme.kt b/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Theme.kt index 403900ea7..a9e05f754 100644 --- a/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Theme.kt +++ b/app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/theme/Theme.kt @@ -1,4 +1,5 @@ package de.tum.informatics.www1.artemis.native_app.android.ui.theme + import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme @@ -11,11 +12,6 @@ import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -@Immutable -data class ExtendedColorScheme( - val customColor: ColorFamily, -) - private val lightScheme = lightColorScheme( primary = primaryLight, onPrimary = onPrimaryLight, @@ -244,60 +240,6 @@ private val highContrastDarkColorScheme = darkColorScheme( surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, ) -val extendedLight = ExtendedColorScheme( - customColor = ColorFamily( - customColorLight, - onCustomColorLight, - customColorContainerLight, - onCustomColorContainerLight, - ), -) - -val extendedDark = ExtendedColorScheme( - customColor = ColorFamily( - customColorDark, - onCustomColorDark, - customColorContainerDark, - onCustomColorContainerDark, - ), -) - -val extendedLightMediumContrast = ExtendedColorScheme( - customColor = ColorFamily( - customColorLightMediumContrast, - onCustomColorLightMediumContrast, - customColorContainerLightMediumContrast, - onCustomColorContainerLightMediumContrast, - ), -) - -val extendedLightHighContrast = ExtendedColorScheme( - customColor = ColorFamily( - customColorLightHighContrast, - onCustomColorLightHighContrast, - customColorContainerLightHighContrast, - onCustomColorContainerLightHighContrast, - ), -) - -val extendedDarkMediumContrast = ExtendedColorScheme( - customColor = ColorFamily( - customColorDarkMediumContrast, - onCustomColorDarkMediumContrast, - customColorContainerDarkMediumContrast, - onCustomColorContainerDarkMediumContrast, - ), -) - -val extendedDarkHighContrast = ExtendedColorScheme( - customColor = ColorFamily( - customColorDarkHighContrast, - onCustomColorDarkHighContrast, - customColorContainerDarkHighContrast, - onCustomColorContainerDarkHighContrast, - ), -) - @Immutable data class ColorFamily( val color: Color,