Cleanup

woocommerce · Sep 19, 2024 · fff02c2 · fff02c2
1 parent 1880755
commit fff02c2
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/...ommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/WooPosTheme.kt b/...ommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/WooPosTheme.kt
@@ -29,6 +29,11 @@ data class CustomColors(
 private object WooPosColors {
     // Woo POS specific colors:
 
+    // Adding missing colors from the old code to match exactly
+    val primary = Color(0xFF9C70D3)
+    val oldGray870 = Color(0xFFF2EBFF)
+    val oldGray6161 = Color(0xFF616161)
+
     val primaryVariant = Color(0xFF3700B3)
     val secondary = Color(0xFF0A9400)
     val surface = Color(0xFF2E2E2E)
@@ -136,11 +141,6 @@ private object WooPosColors {
     val BlazeBlue60 = Color(0xFF055D9C)
     val BlazeRed5 = Color(0xFFFACFD2)
     val BlazeRed6 = Color(0xFFB32D2E)
-
-    // Adding missing colors from the old code to match exactly
-    val oldPrimary = Color(0xFF9C70D3)
-    val oldGray870 = Color(0xFFF2EBFF)
-    val oldGray6161 = Color(0xFF616161)
 }
 
 /*
@@ -158,7 +158,7 @@ private val DarkColorPalette = darkColors(
  */
 
 private val DarkColorPalette = darkColors(
-    primary = WooPosColors.oldPrimary, // val oldPrimary = Color(0xFF9C70D3)
+    primary = WooPosColors.primary,
     primaryVariant = WooPosColors.primaryVariant, // val primaryVariant = Color(0xFF3700B3)
     onPrimary = Color.Black,
     secondary = WooPosColors.secondary, // val secondary = Color(0xFF0A9400)
@@ -210,15 +210,15 @@ private val DarkCustomColors = CustomColors(
  */
 
 private val DarkCustomColors = CustomColors(
-    loadingSkeleton = WooPosColors.oldGray6161, // val oldGray6161 = Color(0xFF616161)
+    loadingSkeleton = WooPosColors.oldGray6161,
     border = Color(0xFF8D8D8D),
     success = Color(0xFF06B166),
-    error = WooPosColors.darkCustomColorsError, // val darkCustomColorsError = Color(0xFFBE4400)
-    paymentSuccessBackground = WooPosColors.darkCustomColorsPaymentSuccessBackground, // val darkCustomColorsPaymentSuccessBackground = Color(0xFF005139)
-    paymentSuccessText = WooPosColors.oldGray870, // val oldGray870 = Color(0xFFF2EBFF)
+    error = WooPosColors.darkCustomColorsError,
+    paymentSuccessBackground = WooPosColors.darkCustomColorsPaymentSuccessBackground,
+    paymentSuccessText = WooPosColors.oldGray870,
     paymentSuccessIcon = Color.White,
-    paymentSuccessIconBackground = WooPosColors.darkCustomColorsPaymentSuccessIconBackground, // val darkCustomColorsPaymentSuccessIconBackground = Color(0xFF00AD64)
-    homeBackground = WooPosColors.Gray80, // val Gray80 = Color(0xFF2C3338)
+    paymentSuccessIconBackground = WooPosColors.darkCustomColorsPaymentSuccessIconBackground,
+    homeBackground = WooPosColors.Gray80,
 )
 
 /*
@@ -239,12 +239,12 @@ private val LightCustomColors = CustomColors(
     loadingSkeleton = Color(0xFFE1E1E1),
     border = Color(0xFFC6C6C8),
     success = Color(0xFF03D479),
-    error = WooPosColors.LightCustomColorsError, // val LightCustomColorsError = Color(0xFFF16618)
+    error = WooPosColors.LightCustomColorsError,
     paymentSuccessBackground = Color(0xFF98F179),
-    paymentSuccessText = WooPosColors.Purple90, // val Purple90 = Color(0xFF271B3D)
+    paymentSuccessText = WooPosColors.Purple90,
     paymentSuccessIcon = Color(0xFF03D479),
-    paymentSuccessIconBackground = Color.White, // val White = Color(0xFFFFFFFF)
-    homeBackground = WooPosColors.Gray0, // val Gray0 = Color(0xFFF6F7F7)
+    paymentSuccessIconBackground = Color.White,
+    homeBackground = WooPosColors.Gray0,
 )
 
 private val LocalCustomColors = staticCompositionLocalOf {