Renamed color vals and color file

2025-10-21 20:04:03 +03:00
parent 6e4c771495
commit 1548e48e08
3 changed files with 100 additions and 100 deletions
--- a/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AppTheme.kt
@ -39,54 +39,54 @@ fun AppTheme(
                dynamicLightColorScheme(context)
        }
        useDarkTheme || isSystemInDarkTheme() -> darkColorScheme(
-            primary = dark_primary,
-            onPrimary = dark_on_primary,
-            primaryContainer = dark_primary_container,
-            onPrimaryContainer = dark_on_primary_container,
-            secondary = dark_secondary,
-            onSecondary = dark_on_secondary,
-            secondaryContainer = dark_secondary_container,
-            onSecondaryContainer = dark_on_secondary_container,
-            tertiary = dark_tertiary,
-            onTertiary = dark_on_tertiary,
-            tertiaryContainer = dark_tertiary_container,
-            onTertiaryContainer = dark_on_tertiary_container,
-            error = dark_error,
-            onError = dark_on_error,
-            errorContainer = dark_error_container,
-            onErrorContainer = dark_on_error_container,
-            background = dark_background,
-            onBackground = dark_on_background,
-            surface = dark_surface,
-            onSurface = dark_on_surface,
-            surfaceVariant = dark_surfaceVariant,
-            onSurfaceVariant = dark_on_surfaceVariant,
-            outline = dark_outline
+            primary = PrimaryDark,
+            onPrimary = OnPrimaryDark,
+            primaryContainer = PrimaryContainerDark,
+            onPrimaryContainer = OnPrimaryContainerDark,
+            secondary = SecondaryDark,
+            onSecondary = OnSecondaryDark,
+            secondaryContainer = SecondaryContainerDark,
+            onSecondaryContainer = OnSecondaryContainerDark,
+            tertiary = TertiaryDark,
+            onTertiary = OnTertiaryDark,
+            tertiaryContainer = TertiaryContainerDark,
+            onTertiaryContainer = OnTertiaryContainerDark,
+            error = ErrorDark,
+            onError = OnErrorDark,
+            errorContainer = ErrorContainerDark,
+            onErrorContainer = OnErrorContainerDark,
+            background = BackgroundDark,
+            onBackground = OnBackgroundDark,
+            surface = SurfaceDark,
+            onSurface = OnSurfaceDark,
+            surfaceVariant = SurfaceVariantDark,
+            onSurfaceVariant = OnSurfaceVariantDark,
+            outline = OutlineDark
        )
        else -> lightColorScheme(
-            primary = light_primary,
-            onPrimary = light_on_primary,
-            primaryContainer = light_primary_container,
-            onPrimaryContainer = light_on_primary_container,
-            secondary = light_secondary,
-            onSecondary = light_on_secondary,
-            secondaryContainer = light_secondary_container,
-            onSecondaryContainer = light_on_secondary_container,
-            tertiary = light_tertiary,
-            onTertiary = light_on_tertiary,
-            tertiaryContainer = light_tertiary_container,
-            onTertiaryContainer = light_on_tertiary_container,
-            error = light_error,
-            onError = light_on_error,
-            errorContainer = light_error_container,
-            onErrorContainer = light_on_error_container,
-            background = light_background,
-            onBackground = light_on_background,
-            surface = light_surface,
-            onSurface = light_on_surface,
-            surfaceVariant = light_surfaceVariant,
-            onSurfaceVariant = light_on_surfaceVariant,
-            outline = light_outline
+            primary = Primary,
+            onPrimary = OnPrimary,
+            primaryContainer = PrimaryContainer,
+            onPrimaryContainer = OnPrimaryContainer,
+            secondary = Secondary,
+            onSecondary = OnSecondary,
+            secondaryContainer = SecondaryContainer,
+            onSecondaryContainer = OnSecondaryContainer,
+            tertiary = Tertiary,
+            onTertiary = OnTertiary,
+            tertiaryContainer = TertiaryContainer,
+            onTertiaryContainer = OnTertiaryContainer,
+            error = Error,
+            onError = OnError,
+            errorContainer = ErrorContainer,
+            onErrorContainer = OnErrorContainer,
+            background = Background,
+            onBackground = OnBackground,
+            surface = Surface,
+            onSurface = OnSurface,
+            surfaceVariant = SurfaceVariant,
+            onSurfaceVariant = OnSurfaceVariant,
+            outline = Outline
        )
    }

--- a/app/src/main/kotlin/com/tutpro/baresip/Colors.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Colors.kt
@ -0,0 +1,54 @@
+package com.tutpro.baresip
+
+import androidx.compose.ui.graphics.Color
+
+// App's color palette is defined by these values, which are used to build
+// the MaterialTheme in AppTheme.kt
+
+val Primary = Color(0xff0ca1fd)
+val OnPrimary = Color(0xFFFFFFFF)
+val PrimaryContainer = Color(0xFFA1CBE6)
+val OnPrimaryContainer = Color(0xFF032133)
+val Secondary = Color(0xFF00B9A1)
+val OnSecondary = Color(0xffe0e0e0)
+val SecondaryContainer = Color(0xFF9DE6DC)
+val OnSecondaryContainer = Color(0xFF00332C)
+val Tertiary = Color(0xFF9885B5)
+val OnTertiary = Color(0xffe0e0e0)
+val TertiaryContainer = Color(0xFFDAD2E6)
+val OnTertiaryContainer = Color(0xFF2B2533)
+val Error = Color(0xFFB3261E)
+val OnError = Color(0xffe0e0e0)
+val ErrorContainer = Color(0xFFE6BFB1)
+val OnErrorContainer = Color(0xFF33180E)
+val Background = Color(0xFFFCFCFC)
+val OnBackground = Color(0xFF313233)
+val Surface = Color(0xFFfbfcfc)
+val OnSurface = Color(0xFF313233)
+val SurfaceVariant = Color(0xFFd8e0e6)
+val OnSurfaceVariant = Color(0xFF535f66)
+val Outline = Color(0xFF7c8e99)
+
+val PrimaryDark = Color(0xFF84C1E6)
+val OnPrimaryDark = Color(0xFF04314C)
+val PrimaryContainerDark = Color(0xFF054166)
+val OnPrimaryContainerDark = Color(0xFFA1CBE6)
+val SecondaryDark = Color(0xFF7FE6D8)
+val OnSecondaryDark = Color(0xFF004C43)
+val SecondaryContainerDark = Color(0xFF006659)
+val OnSecondaryContainerDark = Color(0xFF9DE6DC)
+val TertiaryDark = Color(0xFFD5CAE6)
+val OnTertiaryDark = Color(0xFF40384C)
+val TertiaryContainerDark = Color(0xFF564A66)
+val OnTertiaryContainerDark = Color(0xFFDAD2E6)
+val ErrorDark = Color(0xFFE6AF9C)
+val OnErrorDark = Color(0xFF4C2415)
+val ErrorContainerDark = Color(0xFF66301D)
+val OnErrorContainerDark = Color(0xFFE6BFB1)
+val BackgroundDark = Color(0xFF313233)
+val OnBackgroundDark = Color(0xFFe2e4e6)
+val SurfaceDark = Color(0xFF313233)
+val OnSurfaceDark = Color(0xFFe2e4e6)
+val SurfaceVariantDark = Color(0xFF535f66)
+val OnSurfaceVariantDark = Color(0xFFd2dee6)
+val OutlineDark = Color(0xFF9daab3)
--- a/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CustomColors.kt
@ -1,54 +0,0 @@
-package com.tutpro.baresip
-
-import androidx.compose.ui.graphics.Color
-
-// App's color palette is defined by these values, which are used to build
-// the MaterialTheme in AppTheme.kt
-
-val light_primary = Color(0xff0ca1fd)
-val light_on_primary = Color(0xFFFFFFFF)
-val light_primary_container = Color(0xFFA1CBE6)
-val light_on_primary_container = Color(0xFF032133)
-val light_secondary = Color(0xFF00B9A1)
-val light_on_secondary = Color(0xffe0e0e0)
-val light_secondary_container = Color(0xFF9DE6DC)
-val light_on_secondary_container = Color(0xFF00332C)
-val light_tertiary = Color(0xFF9885B5)
-val light_on_tertiary = Color(0xffe0e0e0)
-val light_tertiary_container = Color(0xFFDAD2E6)
-val light_on_tertiary_container = Color(0xFF2B2533)
-val light_error = Color(0xFFB3261E)
-val light_on_error = Color(0xffe0e0e0)
-val light_error_container = Color(0xFFE6BFB1)
-val light_on_error_container = Color(0xFF33180E)
-val light_background = Color(0xFFFCFCFC)
-val light_on_background = Color(0xFF313233)
-val light_surface = Color(0xFFfbfcfc)
-val light_on_surface = Color(0xFF313233)
-val light_surfaceVariant = Color(0xFFd8e0e6)
-val light_on_surfaceVariant = Color(0xFF535f66)
-val light_outline = Color(0xFF7c8e99)
-
-val dark_primary = Color(0xFF84C1E6)
-val dark_on_primary = Color(0xFF04314C)
-val dark_primary_container = Color(0xFF054166)
-val dark_on_primary_container = Color(0xFFA1CBE6)
-val dark_secondary = Color(0xFF7FE6D8)
-val dark_on_secondary = Color(0xFF004C43)
-val dark_secondary_container = Color(0xFF006659)
-val dark_on_secondary_container = Color(0xFF9DE6DC)
-val dark_tertiary = Color(0xFFD5CAE6)
-val dark_on_tertiary = Color(0xFF40384C)
-val dark_tertiary_container = Color(0xFF564A66)
-val dark_on_tertiary_container = Color(0xFFDAD2E6)
-val dark_error = Color(0xFFE6AF9C)
-val dark_on_error = Color(0xFF4C2415)
-val dark_error_container = Color(0xFF66301D)
-val dark_on_error_container = Color(0xFFE6BFB1)
-val dark_background = Color(0xFF313233)
-val dark_on_background = Color(0xFFe2e4e6)
-val dark_surface = Color(0xFF313233)
-val dark_on_surface = Color(0xFFe2e4e6)
-val dark_surfaceVariant = Color(0xFF535f66)
-val dark_on_surfaceVariant = Color(0xFFd2dee6)
-val dark_outline = Color(0xFF9daab3)