perf: app search bar style

Ckid-Home · Jun 14, 2024 · 6f2d47e · 6f2d47e
1 parent 9e79f1e
commit 6f2d47e
Showing 1 changed file with 45 additions and 55 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/component/AppBarTextField.kt b/app/src/main/kotlin/li/songe/gkd/ui/component/AppBarTextField.kt
@@ -7,24 +7,20 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.selection.LocalTextSelectionColors
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TextFieldDefaults.indicatorLine
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
@@ -42,19 +38,17 @@ fun AppBarTextField(
     keyboardActions: KeyboardActions = KeyboardActions.Default,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
-    val textStyle = LocalTextStyle.current
+
     // make sure there is no background color in the decoration box
     val colors = TextFieldDefaults.colors(
-        focusedContainerColor = Color.Unspecified,
-        unfocusedContainerColor = Color.Unspecified,
-        disabledContainerColor = Color.Unspecified,
+        focusedContainerColor = Color.Transparent,
+        unfocusedContainerColor = Color.Transparent,
+        disabledContainerColor = Color.Transparent,
+        focusedIndicatorColor = Color.Transparent,
+        unfocusedIndicatorColor = Color.Transparent,
     )
 
-    // If color is not provided via the text style, use content color as a default
-    val textColor = textStyle.color.takeOrElse {
-        MaterialTheme.colorScheme.onSurface
-    }
-    val mergedTextStyle = textStyle.merge(TextStyle(color = textColor))
+    val mergedTextStyle = LocalTextStyle.current.merge(MaterialTheme.typography.titleMedium)
 
     // request focus when this composable is first initialized
 //    val focusRequester = FocusRequester()
@@ -68,47 +62,43 @@ fun AppBarTextField(
     }
     textFieldValue = textFieldValue.copy(text = value) // make sure to keep the value updated
 
-    CompositionLocalProvider(
-        LocalTextSelectionColors provides LocalTextSelectionColors.current
-    ) {
-        BasicTextField(
-            value = textFieldValue,
-            onValueChange = {
-                textFieldValue = it
-                // remove newlines to avoid strange layout issues, and also because singleLine=true
-                onValueChange(it.text.replace("\n", ""))
-            },
-            modifier = modifier
-                .fillMaxWidth()
-                .heightIn(32.dp)
-                .indicatorLine(
-                    enabled = true,
-                    isError = false,
-                    interactionSource = interactionSource,
-                    colors = colors
-                ),
+    BasicTextField(
+        value = textFieldValue,
+        onValueChange = {
+            textFieldValue = it
+            // remove newlines to avoid strange layout issues, and also because singleLine=true
+            onValueChange(it.text.replace("\n", ""))
+        },
+        modifier = modifier
+            .fillMaxWidth()
+            .heightIn(32.dp)
+            .indicatorLine(
+                enabled = true,
+                isError = false,
+                interactionSource = interactionSource,
+                colors = colors
+            ),
 //                .focusRequester(focusRequester),
-            textStyle = mergedTextStyle,
-            cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
-            keyboardOptions = keyboardOptions,
-            keyboardActions = keyboardActions,
-            interactionSource = interactionSource,
-            singleLine = true,
-            decorationBox = { innerTextField ->
-                // places text field with placeholder and appropriate bottom padding
-                TextFieldDefaults.DecorationBox(
-                    value = value,
-                    innerTextField = innerTextField,
-                    enabled = true,
-                    singleLine = true,
-                    visualTransformation = VisualTransformation.None,
-                    interactionSource = interactionSource,
-                    isError = false,
-                    placeholder = { Text(text = hint) },
-                    colors = colors,
-                    contentPadding = PaddingValues(bottom = 4.dp),
-                )
-            },
-        )
-    }
+        textStyle = mergedTextStyle,
+        cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions,
+        interactionSource = interactionSource,
+        singleLine = true,
+        decorationBox = { innerTextField ->
+            // places text field with placeholder and appropriate bottom padding
+            TextFieldDefaults.DecorationBox(
+                value = value,
+                innerTextField = innerTextField,
+                enabled = true,
+                singleLine = true,
+                visualTransformation = VisualTransformation.None,
+                interactionSource = interactionSource,
+                isError = false,
+                placeholder = { Text(text = hint) },
+                colors = colors,
+                contentPadding = PaddingValues(bottom = 4.dp),
+            )
+        },
+    )
 }