Merge pull request #185 from tarkalabs/mahi/component/TUIInspecModule

Required Things added for TUIInspectionModule (EAM260 -ui) Component was created.
tarkalabs · Feb 13, 2024 · a4d79a1 · a4d79a1
2 parents 7eb2622 + 6f3f22b
commit a4d79a1
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 89 deletions.
diff --git a/tarkaui/build.gradle.kts b/tarkaui/build.gradle.kts
@@ -66,7 +66,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "1.0.7"     
+        version = "1.0.7"
         artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar")
       }
     }
@@ -97,7 +97,6 @@ dependencies {
   androidTestImplementation("androidx.test.ext:junit:1.1.5")
   androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
   androidTestImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
-  androidTestImplementation("org.mockito:mockito-android:4.5.1")
 
   androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.3")
   androidTestImplementation("org.mockito:mockito-android:4.5.1")

diff --git a/...TUICardHeaderScreenShotTest_darkTheme_false_tagShownfalse_trailIcShownfalse.png b/...TUICardHeaderScreenShotTest_darkTheme_false_tagShownfalse_trailIcShownfalse.png
diff --git a/....TUICardHeaderScreenShotTest_darkTheme_false_tagShownfalse_trailIcShowntrue.png b/....TUICardHeaderScreenShotTest_darkTheme_false_tagShownfalse_trailIcShowntrue.png
diff --git a/....TUICardHeaderScreenShotTest_darkTheme_false_tagShowntrue_trailIcShownfalse.png b/....TUICardHeaderScreenShotTest_darkTheme_false_tagShowntrue_trailIcShownfalse.png
diff --git a/...s.TUICardHeaderScreenShotTest_darkTheme_false_tagShowntrue_trailIcShowntrue.png b/...s.TUICardHeaderScreenShotTest_darkTheme_false_tagShowntrue_trailIcShowntrue.png
diff --git a/....TUICardHeaderScreenShotTest_darkTheme_true_tagShownfalse_trailIcShownfalse.png b/....TUICardHeaderScreenShotTest_darkTheme_true_tagShownfalse_trailIcShownfalse.png
diff --git a/...s.TUICardHeaderScreenShotTest_darkTheme_true_tagShownfalse_trailIcShowntrue.png b/...s.TUICardHeaderScreenShotTest_darkTheme_true_tagShownfalse_trailIcShowntrue.png
diff --git a/...s.TUICardHeaderScreenShotTest_darkTheme_true_tagShowntrue_trailIcShownfalse.png b/...s.TUICardHeaderScreenShotTest_darkTheme_true_tagShowntrue_trailIcShownfalse.png
diff --git a/...ts.TUICardHeaderScreenShotTest_darkTheme_true_tagShowntrue_trailIcShowntrue.png b/...ts.TUICardHeaderScreenShotTest_darkTheme_true_tagShowntrue_trailIcShowntrue.png
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUICardHeaderTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUICardHeaderTest.kt
diff --git a/...rc/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUICardHeaderScreenShotTest.kt b/...rc/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUICardHeaderScreenShotTest.kt
diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/theme/Color.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/theme/Color.kt
@@ -49,6 +49,12 @@ open class TUIColors(
   val primaryAltHover:Color,
   val accent: Color,
   val onAccent: Color,
+  val onAccentK: Color,
+  val onAccentP: Color,
+  val onAccentF: Color,
+  val accentBaseK: Color,
+  val accentBaseP: Color,
+  val accentBaseF: Color,
   val accentBaseC: Color,
   val onAccentC: Color,
   val accentJ: Color,
@@ -103,6 +109,12 @@ val defaultLightColors = TUIColors(
   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) ,
   accentBaseC = Color(0xFFEDE8DE),
   onAccentC = Color(0xFF8F5F00),
   accentJ = Color(0XFFDEEDED),
@@ -153,6 +165,12 @@ val defaultDarkColors = TUIColors(
   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),
   accentBaseC = Color(0xFF3C3220),
   onAccentC =Color(0xFFFFDD99),
   accentJ = Color(0xFF203C3C),