Remove all direct usages of mullvad colors

3 files changed, 13 insertions, 33 deletions

diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
index 8342591343..8d68723679 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
@@ -25,9 +25,11 @@ import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_error
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onError
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onPrimary
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onSurfaceVariant
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_onTertiaryContainer
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_primary
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_secondaryContainer
 import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_surfaceVariant
+import net.mullvad.mullvadvpn.lib.theme.color.md_theme_dark_tertiaryContainer
 import net.mullvad.mullvadvpn.lib.theme.dimensions.Dimensions
 import net.mullvad.mullvadvpn.lib.theme.dimensions.defaultDimensions
 import net.mullvad.mullvadvpn.lib.theme.typeface.TypeScale
@@ -63,8 +65,8 @@ private val darkColorScheme =
         secondaryContainer = md_theme_dark_secondaryContainer,
         tertiary = MullvadRed,
         // onTertiary = md_theme_dark_onTertiary,
-        // tertiaryContainer = md_theme_dark_tertiaryContainer,
-        // onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+        tertiaryContainer = md_theme_dark_tertiaryContainer,
+        onTertiaryContainer = md_theme_dark_onTertiaryContainer,
         error = md_theme_dark_error,
         errorContainer = MullvadYellow,
         onError = md_theme_dark_onError,
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
index 0369ca8700..82f924ebe0 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt
@@ -6,35 +6,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
 internal val MullvadYellow = Color(0xFFFFD524)
-
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadBlue = Color(0xFF294D73)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadDarkBlue = Color(0xFF192E45)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadGreen = Color(0xFF44AD4D)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadRed = Color(0xFFE34039)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadWhite = Color(0xFFFFFFFF)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadWhite10 = Color(0x1AFFFFFF)
-@Deprecated(
-    "Deprecated for external usage and will be marked as internal in the future. Use material colors instead."
-)
-val MullvadWhite60 = Color(0x99FFFFFF)
+internal val MullvadGreen = Color(0xFF44AD4D)
+internal val MullvadWhite60 = Color(0x99FFFFFF)
+internal val MullvadWhite = Color(0xFFFFFFFF)
+internal val MullvadRed = Color(0xFFE34039)
+internal val MullvadDarkBlue = Color(0xFF192E45)
 
 const val AlphaVisible = 1f
 const val AlphaDisabled = 0.2f
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
index f0145653e5..413a37f93e 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
@@ -43,8 +43,10 @@ internal val md_theme_dark_secondaryContainer =
 internal val md_theme_dark_onSecondaryContainer = Color(0xFFD9EEDB) // Text in titlebar
 internal val md_theme_dark_tertiary = Color(0xFF99454F) // Disconnect button
 internal val md_theme_dark_onTertiary = Color(0xFFFFFFFF) // MullvadWhite/Text on disconnect button
-internal val md_theme_dark_tertiaryContainer = Color(0xFF643F00) // Generated
-internal val md_theme_dark_onTertiaryContainer = Color(0xFFFFFFFF) // MullvadWhite
+internal val md_theme_dark_tertiaryContainer =
+    Color(0xff304358) // MullvadWhite Alpha 10 composite over MullvadDarkBlue
+internal val md_theme_dark_onTertiaryContainer =
+    Color(0xffacb4bc) // MullvadWhite Alpha 60 composite over tertiary container
 internal val md_theme_dark_error = Color(0xFFE34039) // MullvadRed
 internal val md_theme_dark_errorContainer = Color(0xFFE34039) // MullvadRed //Duplicate
 internal val md_theme_dark_onError = Color(0xFFFFFFFF) // MullvadWhite