Merge pull request #196 from tarkalabs/mahi/enhance/rem_colors

All Accent & OnAccent Color Variants added.
tarkalabs · Feb 22, 2024 · 40845fb · 40845fb
2 parents 3e52737 + 5a3ac28
commit 40845fb
Showing 1 changed file with 99 additions and 33 deletions.
diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/theme/Color.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/theme/Color.kt
@@ -48,21 +48,43 @@ open class TUIColors(
   val surfaceHover: Color,
   val primaryAltHover:Color,
   val accent: Color,
-  val onAccent: Color,
-  val onAccentK: Color,
-  val onAccentP: Color,
-  val onAccentF: Color,
+  val accentBaseA: Color,
+  val accentBaseB: Color,
+  val accentBaseC: Color,
+  val accentBaseD: Color,
+  val accentBaseE: Color,
+  val accentBaseF: Color,
+  val accentBaseG: Color,
+  val accentBaseH: Color,
+  val accentBaseI: Color,
+  val accentBaseJ: Color,
   val accentBaseK: Color,
+  val accentBaseL: Color,
+  val accentBaseM: Color,
+  val accentBaseN: Color,
+  val accentBaseO: Color,
   val accentBaseP: Color,
-  val accentBaseF: Color,
-  val accentBaseC: Color,
+  val accentBaseQ: Color,
+  val accentBaseR: Color,
+  val onAccent: Color,
+  val onAccentA: Color,
+  val onAccentB: Color,
   val onAccentC: Color,
-  val accentJ: Color,
+  val onAccentD: Color,
+  val onAccentE: Color,
+  val onAccentF: Color,
+  val onAccentG: Color,
+  val onAccentH: Color,
+  val onAccentI: Color,
   val onAccentJ: Color,
-  val accentQ: Color,
+  val onAccentK: Color,
+  val onAccentL: Color,
+  val onAccentM: Color,
+  val onAccentN: Color,
+  val onAccentO: Color,
+  val onAccentP: Color,
   val onAccentQ: Color,
-  val accentO: Color,
-  val onAccentO: Color
+  val onAccentR: Color
 )
 
 val LocalTUIColors = staticCompositionLocalOf {
@@ -112,21 +134,43 @@ val defaultLightColors = TUIColors(
   surfaceHover = Color(0xFFF0F2F5),
   primaryAltHover = Color(0xFFC4D7F3),
   accent = Color(0xFFE8DEED),
-  onAccent = Color(0xFF5F008F),
-  onAccentF = Color(0XFF308F00) ,
-  onAccentK = Color(0XFF005F8F) ,
-  onAccentP = Color(0XFF8F008F) ,
-  accentBaseK = Color(0XFFDEE8ED) ,
-  accentBaseP = Color(0XFFEDDEED) ,
-  accentBaseF = Color(0XFFE3EDDE) ,
+  accentBaseA = Color(0xFFEDDEDE),
+  accentBaseB = Color(0xFFEDE3DE),
   accentBaseC = Color(0xFFEDE8DE),
+  accentBaseD = Color(0xFFEDEDDE),
+  accentBaseE = Color(0xFFE8EDDE),
+  accentBaseF = Color(0XFFE3EDDE),
+  accentBaseG = Color(0xFFDEEDDE),
+  accentBaseH = Color(0xFFDEEDE3),
+  accentBaseI = Color(0xFFDEEDE8),
+  accentBaseJ = Color(0xFFDEEDED),
+  accentBaseK = Color(0XFFDEE8ED),
+  accentBaseL = Color(0xFFDEE3ED),
+  accentBaseM = Color(0xFFDEDEED),
+  accentBaseN = Color(0xFFE3DEED),
+  accentBaseO = Color(0xFFE8DEED),
+  accentBaseP = Color(0XFFEDDEED) ,
+  accentBaseQ = Color(0xFFEDDEE8),
+  accentBaseR = Color(0xFFEDDEE3),
+  onAccent = Color(0xFF5F008F),
+  onAccentA = Color(0xFF8F0000),
+  onAccentB = Color(0xFF8F3000),
   onAccentC = Color(0xFF8F5F00),
-  accentJ = Color(0XFFDEEDED),
-  onAccentJ = Color(0xFF008F82),
-  accentQ = Color(0xFFEDDEE8),
+  onAccentD = Color(0xFF8F8F00),
+  onAccentE = Color(0xFF5F8F00),
+  onAccentF = Color(0XFF308F00),
+  onAccentG = Color(0xFF008F00),
+  onAccentH = Color(0xFF008F30),
+  onAccentI = Color(0xFF008F5F),
+  onAccentJ = Color(0xFF008F8F),
+  onAccentK = Color(0XFF005F8F),
+  onAccentL = Color(0xFF00308F),
+  onAccentM = Color(0xFF00008F),
+  onAccentN = Color(0xFF30008F),
+  onAccentO = Color(0xFF5F008F),
+  onAccentP = Color(0XFF8F008F) ,
   onAccentQ = Color(0xFF8F005F),
-  accentO = Color(0xFFE8DEED),
-  onAccentO = Color(0xFF5F008F)
+  onAccentR = Color(0xFF8F0030),
 )
 
 val defaultDarkColors = TUIColors(
@@ -172,20 +216,42 @@ val defaultDarkColors = TUIColors(
   surfaceHover = Color(0xFF29313D),
   primaryAltHover = Color(0xFF324767),
   accent = Color(0xFF32203C),
-  onAccent = Color(0xFFDD99FF),
-  onAccentF = Color(0xFF293C20),
-  onAccentK = Color(0xFF20323C),
-  onAccentP = Color(0xFF3C203C),
-  accentBaseK = Color(0xFF99DDFF),
-  accentBaseP = Color(0xFFFF99FF),
-  accentBaseF = Color(0xFFBBFF99),
+  accentBaseA = Color(0xFF3C2020),
+  accentBaseB = Color(0xFF3C2920),
   accentBaseC = Color(0xFF3C3220),
+  accentBaseD = Color(0xFF3C3C20),
+  accentBaseE = Color(0xFF323C20),
+  accentBaseF = Color(0XFF293C20),
+  accentBaseG = Color(0xFF203C20),
+  accentBaseH = Color(0xFF203C29),
+  accentBaseI = Color(0xFF203C32),
+  accentBaseJ = Color(0xFF203C3C),
+  accentBaseK = Color(0XFF20323C),
+  accentBaseL = Color(0xFFDEE3ED),
+  accentBaseM = Color(0xFFDEDEED),
+  accentBaseN = Color(0xFFE3DEED),
+  accentBaseO = Color(0xFFE8DEED),
+  accentBaseP = Color(0XFF3C203C) ,
+  accentBaseQ = Color(0xFF3C2032),
+  accentBaseR = Color(0xFF3C2029),
+  onAccent = Color(0xFFDD99FF),
+  onAccentA = Color(0xFFFF9999),
+  onAccentB = Color(0xFFFFBB99),
   onAccentC =Color(0xFFFFDD99),
-  accentJ = Color(0xFF203C3C),
+  onAccentD = Color(0xFFFFFF99),
+  onAccentE = Color(0xFFDDFF99),
+  onAccentF = Color(0XFFBBFF99),
+  onAccentG = Color(0xFF99FF99),
+  onAccentH = Color(0xFF99FFBB),
+  onAccentI = Color(0xFF99FFDD),
   onAccentJ = Color(0xFF99FFFF),
-  accentQ = Color(0xFF3C2032),
+  onAccentK = Color(0XFF99DDFF),
+  onAccentL = Color(0xFF99BBFF),
+  onAccentM = Color(0xFF9999FF),
+  onAccentN = Color(0xFFBB99FF),
+  onAccentO = Color(0xFFDD99FF),
+  onAccentP = Color(0XFFFF99FF) ,
   onAccentQ = Color(0xFFFF99DD),
-  accentO = Color(0xFF32203C),
-  onAccentO = Color(0xFFDD99FF)
+  onAccentR = Color(0xFFFF99BB),
   )