From df725115a8edba23b043745a94b5b3b3fb333508 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jul 2024 23:47:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[DEL/#25]=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designsystem/textfield/SearchTextField.kt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt b/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt index e06cfa14f..aad31e85d 100644 --- a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt +++ b/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt @@ -13,17 +13,17 @@ fun SearchTextField( hint: String, leftIcon: Int, ) { -// TerningBasicTextField( -// value = text, -// onValueChange = onValueChange, -// textStyle = TerningTheme.typography.button3, -// textColor = Grey400, -// cursorBrush = SolidColor(Grey300), -// drawLineColor = Grey300, -// strokeWidth = 2f, -// hint = hint, -// hintColor = Grey300, -// leftIcon = leftIcon, -// leftIconColor = Grey400, -// ) + TerningBasicTextField( + value = text, + onValueChange = onValueChange, + textStyle = TerningTheme.typography.button3, + textColor = Grey400, + cursorBrush = SolidColor(Grey300), + drawLineColor = Grey300, + strokeWidth = 2f, + hint = hint, + hintColor = Grey300, + leftIcon = leftIcon, + leftIconColor = Grey400, + ) } \ No newline at end of file From ebed117238ae4e8ba2856e2390dff98eebd6029a Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 9 Jul 2024 23:49:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[MOVE/#25]=20text=20field=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => component}/textfield/NameTextField.kt | 2 +- .../{ => component}/textfield/SearchTextField.kt | 2 +- .../{ => component}/textfield/TerningBasicTextField.kt | 2 +- .../main/java/com/terning/feature/search/SearchRoute.kt | 8 ++------ 4 files changed, 5 insertions(+), 9 deletions(-) rename core/src/main/java/com/terning/core/designsystem/{ => component}/textfield/NameTextField.kt (95%) rename core/src/main/java/com/terning/core/designsystem/{ => component}/textfield/SearchTextField.kt (92%) rename core/src/main/java/com/terning/core/designsystem/{ => component}/textfield/TerningBasicTextField.kt (98%) diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt similarity index 95% rename from core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt rename to core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt index 6b5a9ec9a..88d60457d 100644 --- a/core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.textfield +package com.terning.core.designsystem.component.textfield import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt similarity index 92% rename from core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt rename to core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt index aad31e85d..bc065431e 100644 --- a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.textfield +package com.terning.core.designsystem.component.textfield import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.SolidColor diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt similarity index 98% rename from core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt rename to core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt index 7a030647e..358e42b5a 100644 --- a/core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.textfield +package com.terning.core.designsystem.component.textfield import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt index 1c2531d5a..90701416c 100644 --- a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt +++ b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt @@ -1,22 +1,18 @@ package com.terning.feature.search -import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Text import androidx.compose.runtime.Composable 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.input.pointer.pointerInput -import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.terning.core.designsystem.textfield.NameTextField -import com.terning.core.designsystem.textfield.SearchTextField +import com.terning.core.designsystem.component.textfield.NameTextField +import com.terning.core.designsystem.component.textfield.SearchTextField import com.terning.core.designsystem.theme.Grey400 import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.WarningRed