From b90aa99004c09e0ffe573983224ff5585e2620c8 Mon Sep 17 00:00:00 2001
From: Sad Ellie <sadellie.dev@gmail.com>
Date: Tue, 23 Jan 2024 17:55:05 +0300
Subject: [PATCH] Fix OutlinedDecimalTextField colors

---
 .../core/ui/common/textfield/OutlinedDecimalTextField.kt | 6 +++++-
 .../feature/bodymass/components/BodyMassTextField.kt     | 7 +++++++
 .../datecalculator/components/TimeUnitTextField.kt       | 9 ++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/OutlinedDecimalTextField.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/OutlinedDecimalTextField.kt
index 7fe348e6..8899fef0 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/OutlinedDecimalTextField.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/OutlinedDecimalTextField.kt
@@ -27,6 +27,8 @@ import androidx.compose.material.icons.outlined.Clear
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.TextFieldColors
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.ImeAction
@@ -40,8 +42,9 @@ fun OutlinedDecimalTextField(
     value: TextFieldValue,
     onValueChange: (TextFieldValue) -> Unit,
     label: @Composable () -> Unit,
+    colors: TextFieldColors = OutlinedTextFieldDefaults.colors(),
     expressionFormatter: VisualTransformation,
-    imeAction: ImeAction = ImeAction.Next
+    imeAction: ImeAction = ImeAction.Next,
 ) {
     OutlinedTextField(
         modifier = modifier,
@@ -61,5 +64,6 @@ fun OutlinedDecimalTextField(
             keyboardType = KeyboardType.Decimal,
             imeAction = imeAction
         ),
+        colors = colors
     )
 }
diff --git a/feature/bodymass/src/main/java/com/sadellie/unitto/feature/bodymass/components/BodyMassTextField.kt b/feature/bodymass/src/main/java/com/sadellie/unitto/feature/bodymass/components/BodyMassTextField.kt
index 2df31fed..f44b269f 100644
--- a/feature/bodymass/src/main/java/com/sadellie/unitto/feature/bodymass/components/BodyMassTextField.kt
+++ b/feature/bodymass/src/main/java/com/sadellie/unitto/feature/bodymass/components/BodyMassTextField.kt
@@ -19,6 +19,8 @@
 package com.sadellie.unitto.feature.bodymass.components
 
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -49,6 +51,11 @@ internal fun BodyMassTextField(
             onValueChange(it.copy(cleanText))
         },
         label = { AnimatedContent(label) { Text(it) } },
+        colors = OutlinedTextFieldDefaults
+            .colors(
+                focusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                unfocusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+            ),
         expressionFormatter = expressionFormatter,
         imeAction = imeAction
     )
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
index 47fd1c6a..2fd646df 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
+ * Copyright (c) 2023-2024 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
 package com.sadellie.unitto.feature.datecalculator.components
 
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -43,6 +45,11 @@ internal fun TimeUnitTextField(
             onValueChange(newValue.copy(newValue.text.filter { it.isDigit() }))
         },
         label = { AnimatedContent(label) { Text(it) } },
+        colors = OutlinedTextFieldDefaults
+            .colors(
+                focusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                unfocusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+            ),
         expressionFormatter = expressionFormatter,
         imeAction = imeAction
     )