- Fixed cursor color issue

tarkalabs · Jun 11, 2024 · a78abe7 · a78abe7
1 parent 7e2bc88
commit a78abe7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 86 deletions.
diff --git a/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt b/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
@@ -2,11 +2,9 @@ package com.tarkalabs.ui
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -18,13 +16,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.tarkalabs.tarkaui.components.ChipType.Filter
-import com.tarkalabs.tarkaui.components.HorizontalSpacer
 import com.tarkalabs.tarkaui.components.TUIAppTopBar
-import com.tarkalabs.tarkaui.components.TUIChip
-import com.tarkalabs.tarkaui.components.VerticalSpacer
-import com.tarkalabs.tarkaui.icons.ArrowSort20
+import com.tarkalabs.tarkaui.components.TUISearchBar
+import com.tarkalabs.tarkaui.icons.BarcodeScanner24
 import com.tarkalabs.tarkaui.icons.ChevronRight20
+import com.tarkalabs.tarkaui.icons.Dismiss16
+import com.tarkalabs.tarkaui.icons.TarkaIcons.Filled
 import com.tarkalabs.tarkaui.icons.TarkaIcons.Regular
 import com.tarkalabs.tarkaui.theme.TUITheme
 
@@ -60,87 +57,32 @@ class UIComponentListActivity : ComponentActivity() {
               .fillMaxHeight()
               .padding(horizontal = 8.dp)
           ) {
-            VerticalSpacer(space = 30)
-            Row {
-              HorizontalSpacer(space = 20)
-              TUIChip(
-                type = Filter(
-                  trailingIcon = Regular.ArrowSort20,
-                  showTrailingDismiss = showSearchbar,
-                  showTrailingCaret = true,
-                  selected = showSearchbar
-                ),
-                label = "Something",
-                onClick = {
-                  showSearchbar = true
-                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
-                },
-                onDismissClick = {
-                  showSearchbar = !showSearchbar
-                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
-                },
-              )
-              HorizontalSpacer(space = 20)
-              TUIChip(
-                type = Filter(
-                  trailingIcon = Regular.ArrowSort20,
-                  showTrailingDismiss = true,
-                  showTrailingCaret = true,
-                  selected = true
-                ),
-                label = "Something",
-                onClick = {
-                  showSearchbar = true
-                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
-                },
-                onDismissClick = {
-                  showSearchbar = !showSearchbar
-                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
-                },
-              )
-              HorizontalSpacer(space = 20)
-            }
-            VerticalSpacer(space = 30)
-            Row {
-              HorizontalSpacer(space = 20)
-              TUIChip(
-                type = Filter(
-                  trailingIcon = Regular.ArrowSort20,
-                  showTrailingDismiss = showSearchbar,
-                  showTrailingCaret = true,
-                  showLeadingCheck = true,
-                  selected = showSearchbar
-                ),
-                label = "Something",
-                onClick = {
-                  showSearchbar = true
-                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
-                },
-                onDismissClick = {
-                  showSearchbar = !showSearchbar
-                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+            Column(
+              modifier = Modifier.padding(20.dp)
+            ) {
+              TUISearchBar(
+                query = query,
+                placeholder = "Search",
+                onQueryTextChange = {
+                  query = it
                 },
+                trailingIcon = Filled.Dismiss16,
+                leadingIcon = Regular.BarcodeScanner24,
+                onLeadingIconClick = {},
+                modifier = Modifier.padding(10.dp),
               )
-              HorizontalSpacer(space = 20)
-              TUIChip(
-                type = Filter(
-                  trailingIcon = Regular.ArrowSort20,
-                  showTrailingDismiss = true,
-                  showTrailingCaret = true,
-                  selected = true,
-                  showLeadingCheck = true,
-                ),
-                label = "Something",
-                onClick = {
-                  showSearchbar = true
-                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
-                },
-                onDismissClick = {
-                  showSearchbar = !showSearchbar
-                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+
+              TUISearchBar(
+                query = query,
+                placeholder = "Search",
+                onQueryTextChange = {
+                  query = it
                 },
+                trailingIcon = Filled.Dismiss16,
+                leadingIcon = Regular.BarcodeScanner24,
+                onLeadingIconClick = {},
+                modifier = Modifier.padding(10.dp),
               )
-              HorizontalSpacer(space = 20)
             }
           }
 

diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUISearchBar.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUISearchBar.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
@@ -85,7 +86,8 @@ import kotlinx.coroutines.delay
     interactionSource = interactionSource,
     textStyle = TUITheme.typography.body6.copy(color = TUITheme.colors.inputText),
     keyboardActions = keyboardAction,
-    keyboardOptions = keyboardOption
+    keyboardOptions = keyboardOption,
+    cursorBrush = SolidColor(TUITheme.colors.inputText)
   ) { innerTextField ->
     TextFieldDefaults.DecorationBox(
       value = query,
@@ -98,7 +100,7 @@ import kotlinx.coroutines.delay
         top = 0.dp, bottom = 0.dp, end = 10.dp, start = 10.dp
       ),
       colors = TextFieldDefaults.colors(
-        cursorColor = TUITheme.colors.inputText,
+        cursorColor = TUITheme.colors.error,
         focusedTextColor = TUITheme.colors.inputText,
         unfocusedTextColor = TUITheme.colors.inputText,
         unfocusedPlaceholderColor = TUITheme.colors.inputText.copy(alpha = 0.7f),