Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX/#25] develop 브렌치 / 주석 및 컴포넌트 수정 #26

Merged
merged 2 commits into from
Jul 9, 2024
Merged

[FIX/#25] develop 브렌치 / 주석 및 컴포넌트 수정 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df72511
[DEL/#25] 주석 제거
leeeyubin Jul 9, 2024
ebed117
[MOVE/#25] text field 파일 위치 수정
leeeyubin Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e/designsystem/textfield/NameTextField.kt → ...stem/component/textfield/NameTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 29 additions & 0 deletions core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.terning.core.designsystem.component.textfield

import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.SolidColor
import com.terning.core.designsystem.theme.Grey300
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.TerningTheme

@Composable
fun SearchTextField(
text: String,
onValueChange: (String) -> Unit,
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,
)
}
2 changes: 1 addition & 1 deletion ...system/textfield/TerningBasicTextField.kt → ...ponent/textfield/TerningBasicTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 0 additions & 29 deletions core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions feature/src/main/java/com/terning/feature/search/SearchRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading