From bf5179f51e21bc0b5aea532768fdd7fd29933e57 Mon Sep 17 00:00:00 2001 From: ckals413 Date: Thu, 22 Jan 2026 23:26:44 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EA=B2=80=EC=83=89=20=EC=8B=9C=20?= =?UTF-8?q?=ED=82=A4=EB=B3=B4=EB=93=9C=20=EC=88=A8=EA=B9=80=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/textfield/FlintSearchTextField.kt | 6 ++++-- .../onboarding/OnboardingContentScreen.kt | 14 +++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/flint/core/designsystem/component/textfield/FlintSearchTextField.kt b/app/src/main/java/com/flint/core/designsystem/component/textfield/FlintSearchTextField.kt index 6c35b237..08e7b406 100644 --- a/app/src/main/java/com/flint/core/designsystem/component/textfield/FlintSearchTextField.kt +++ b/app/src/main/java/com/flint/core/designsystem/component/textfield/FlintSearchTextField.kt @@ -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 @@ -32,6 +33,8 @@ fun FlintSearchTextField( onSearchAction: () -> Unit = {}, onClearAction: () -> Unit = {}, ) { + val keyboardController = LocalSoftwareKeyboardController.current + FlintBasicTextField( modifier = modifier.fillMaxWidth(), placeholder = placeholder, @@ -51,11 +54,10 @@ fun FlintSearchTextField( .size(24.dp) .noRippleClickable( onClick = { + keyboardController?.hide() if (value.isNotEmpty()) { onValueChanged("") onClearAction() - } else { - onSearchAction() } }, ), diff --git a/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt b/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt index c7c56422..3b19b78f 100644 --- a/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt +++ b/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt @@ -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 @@ -87,6 +88,8 @@ fun OnboardingContentScreen( onRemoveContent: (SearchContentItemModel) -> Unit, modifier: Modifier = Modifier, ) { + val keyboardController = LocalSoftwareKeyboardController.current + Column( modifier = modifier @@ -97,8 +100,6 @@ fun OnboardingContentScreen( onClick = onBackClick, ) - Spacer(modifier = Modifier.height(16.dp)) - StepProgressBar( currentStep = contentUiState.selectedContents.size, totalSteps = OnboardingContentUiState.REQUIRED_SELECTION_COUNT, @@ -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 ) @@ -158,7 +159,10 @@ fun OnboardingContentScreen( onClearAction = onClearAction, keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), keyboardActions = KeyboardActions( - onSearch = { onSearchAction() } + onSearch = { + keyboardController?.hide() + onSearchAction() + } ), ) From 9e1848f4424db663f99b232bbdaeb09934c7fbe6 Mon Sep 17 00:00:00 2001 From: ckals413 Date: Fri, 23 Jan 2026 00:46:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20ui?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flint/presentation/onboarding/OnboardingContentScreen.kt | 2 +- .../com/flint/presentation/onboarding/OnboardingOttScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt b/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt index 3b19b78f..4399b802 100644 --- a/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt +++ b/app/src/main/java/com/flint/presentation/onboarding/OnboardingContentScreen.kt @@ -206,7 +206,7 @@ fun OnboardingContentScreen( contentAlignment = Alignment.Center, ) { FlintSearchEmptyView( - title = "작품을 찾을 수 없어요" + title = "아직 준비 중인 작품이이요" ) } } diff --git a/app/src/main/java/com/flint/presentation/onboarding/OnboardingOttScreen.kt b/app/src/main/java/com/flint/presentation/onboarding/OnboardingOttScreen.kt index b386c72d..f95bdb6e 100644 --- a/app/src/main/java/com/flint/presentation/onboarding/OnboardingOttScreen.kt +++ b/app/src/main/java/com/flint/presentation/onboarding/OnboardingOttScreen.kt @@ -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 서비스를 알려주세요",