Skip to content

[Feat] 온보딩 부분 수정 #178

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

Merged
nahy-512 merged 2 commits into from
Jan 22, 2026
Merged

[Feat] 온보딩 부분 수정 #178

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
bf5179f
feat: 검색 시 키보드 숨김 처리
ckals413 Jan 22, 2026
9e1848f
style: 온보딩 ui수정
ckals413 Jan 22, 2026
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
6 changes: 4 additions & 2 deletions app/src/main/java/com/flint/core/designsystem/component/textfield/FlintSearchTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand All @@ -32,6 +33,8 @@ fun FlintSearchTextField(
onSearchAction: () -> Unit = {},
onClearAction: () -> Unit = {},
) {
val keyboardController = LocalSoftwareKeyboardController.current

FlintBasicTextField(
modifier = modifier.fillMaxWidth(),
placeholder = placeholder,
Expand All @@ -51,11 +54,10 @@ fun FlintSearchTextField(
.size(24.dp)
.noRippleClickable(
onClick = {
keyboardController?.hide()
if (value.isNotEmpty()) {
onValueChanged("")
onClearAction()
} else {
onSearchAction()
}
},
),
Expand Down
16 changes: 10 additions & 6 deletions app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -87,6 +88,8 @@ fun OnboardingContentScreen(
onRemoveContent: (SearchContentItemModel) -> Unit,
modifier: Modifier = Modifier,
) {
val keyboardController = LocalSoftwareKeyboardController.current

Column(
modifier =
modifier
Expand All @@ -97,8 +100,6 @@ fun OnboardingContentScreen(
onClick = onBackClick,
)

Spacer(modifier = Modifier.height(16.dp))

StepProgressBar(
currentStep = contentUiState.selectedContents.size,
totalSteps = OnboardingContentUiState.REQUIRED_SELECTION_COUNT,
Expand Down Expand Up @@ -137,8 +138,8 @@ fun OnboardingContentScreen(
.dropShadow(
shape = RectangleShape,
color = Color.Black.copy(alpha = 0.75f),
blur = 50.dp,
offsetY = 20.dp,
blur = 12.dp,
offsetY = 12.dp,
offsetX = 0.dp,
spread = 0.dp
)
Expand All @@ -158,7 +159,10 @@ fun OnboardingContentScreen(
onClearAction = onClearAction,
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
keyboardActions = KeyboardActions(
onSearch = { onSearchAction() }
onSearch = {
keyboardController?.hide()
onSearchAction()
}
),
)

Expand Down Expand Up @@ -202,7 +206,7 @@ fun OnboardingContentScreen(
contentAlignment = Alignment.Center,
) {
FlintSearchEmptyView(
title = "작품을 찾을 수 없어요"
title = "아직 준비 중인 작품이이요"
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/flint/presentation/onboarding/OnboardingOttScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fun OnboardingOttScreen(
.weight(1f)
.padding(horizontal = 16.dp),
) {
Spacer(modifier = Modifier.height(24.dp))
Spacer(modifier = Modifier.height(12.dp))

Text(
text = "$nickname 님이 구독 중인\nOTT 서비스를 알려주세요",
Expand Down