From 14590b69d3c41f81a684ceed5637f5010629fdeb Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 20:40:00 +0900 Subject: [PATCH 1/6] [QA] Fix SearchResultCount text style, padding --- .../screen/search/SearchResultScreen.kt | 24 +++++++++++-------- presentation/src/main/res/values/strings.xml | 1 + 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index 0f73c605..c1499b41 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -351,33 +351,37 @@ fun SearchResultEmpty() { @Preview fun SearchResultsCount(resultCount: Int = 0) { Surface( - color = White_FFFFFF, modifier = Modifier .fillMaxWidth() - .height(44.dp), + .height(44.dp) + .background(White_FFFFFF) + .padding(horizontal = 18.dp, vertical = 12.dp) ) { Row( - horizontalArrangement = Arrangement.spacedBy(0.dp), + horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(horizontal = 18.dp, vertical = 12.dp) + modifier = Modifier.height(20.dp) ) { Text( + text = "$resultCount", + modifier = Modifier.padding(end = 2.dp), style = TextStyle( fontSize = 13.sp, + lineHeight = 19.5.sp, fontFamily = FontFamily(Font(R.font.pretendard_medium)), fontWeight = FontWeight(500), color = Primary_23C882 - ), - text = "$resultCount", - modifier = Modifier.padding(end = 2.dp) + ) ) Text( + text = stringResource(R.string.search_result_count_description), style = TextStyle( fontSize = 13.sp, + lineHeight = 19.5.sp, fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500) - ), - text = "개의 검색결과" + fontWeight = FontWeight(500), + color = Gray2_767B83, + ) ) } } diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 236dd6e1..b2790622 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -259,6 +259,7 @@ 추천 검색어 앗! 찾으시는 검색 결과가 없어요. 다른 검색어를 입력해보세요 + 개의 검색 결과 검색 기록 지우기 최근 검색 결과가 없어요. 관심있는 키워드 또는 사용자를 찾아보세요 From 09827e12b34bca437f6e90dfb72c39002d1e2ed4 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 20:47:35 +0900 Subject: [PATCH 2/6] [QA] Add background color on SearchResultsCount --- .../dayo/presentation/screen/search/SearchResultScreen.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index c1499b41..bf8d7745 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -360,7 +360,9 @@ fun SearchResultsCount(resultCount: Int = 0) { Row( horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.height(20.dp) + modifier = Modifier + .height(20.dp) + .background(White_FFFFFF) ) { Text( text = "$resultCount", From ca55d9b8ec91d8de072d5721c25667920c935cd0 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 20:55:19 +0900 Subject: [PATCH 3/6] #1024 [QA] Fix Divider color, thickness on SearchResult tab --- .../dayo/presentation/screen/search/SearchResultScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index bf8d7745..dfae772b 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -50,7 +50,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color.Companion.White import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale @@ -87,6 +86,7 @@ import daily.dayo.presentation.theme.Gray1_50545B import daily.dayo.presentation.theme.Gray2_767B83 import daily.dayo.presentation.theme.Gray3_9FA5AE import daily.dayo.presentation.theme.Gray5_E8EAEE +import daily.dayo.presentation.theme.Gray6_F0F1F3 import daily.dayo.presentation.theme.PrimaryL3_F2FBF7 import daily.dayo.presentation.theme.Primary_23C882 import daily.dayo.presentation.theme.White_FFFFFF @@ -231,7 +231,7 @@ fun SearchResultScreen( color = Primary_23C882, ) }, - divider = { Divider(color = Color.Transparent, thickness = 0.dp) }, + divider = { Divider(color = Gray6_F0F1F3, thickness = 1.dp) }, modifier = Modifier .fillMaxWidth() .padding(18.dp, 0.dp, 18.dp, 0.dp), From 75d3464cbf4e0947405a8c3a4b261d5f86a46857 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 21:15:45 +0900 Subject: [PATCH 4/6] #1026 [QA] Fix spacing in SearchResultEmpty --- .../daily/dayo/presentation/screen/search/SearchResultScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index dfae772b..28074dfa 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -335,6 +335,7 @@ fun SearchResultEmpty() { textAlign = TextAlign.Center ), ) + Spacer(modifier = Modifier.height(2.dp)) Text( modifier = Modifier.padding(vertical = 2.dp), text = stringResource(id = R.string.search_result_empty_description), From cff4b314aa6fa41e9682ffa3bdbaceaecf76ac30 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 21:30:57 +0900 Subject: [PATCH 5/6] #1027 [QA] Fix font weight and color for search result description --- .../presentation/screen/search/SearchResultScreen.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index 28074dfa..7cbe2514 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -85,6 +85,7 @@ import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray1_50545B import daily.dayo.presentation.theme.Gray2_767B83 import daily.dayo.presentation.theme.Gray3_9FA5AE +import daily.dayo.presentation.theme.Gray4_C5CAD2 import daily.dayo.presentation.theme.Gray5_E8EAEE import daily.dayo.presentation.theme.Gray6_F0F1F3 import daily.dayo.presentation.theme.PrimaryL3_F2FBF7 @@ -337,13 +338,11 @@ fun SearchResultEmpty() { ) Spacer(modifier = Modifier.height(2.dp)) Text( - modifier = Modifier.padding(vertical = 2.dp), text = stringResource(id = R.string.search_result_empty_description), - style = DayoTheme.typography.caption1 - .copy( - color = Gray3_9FA5AE, - textAlign = TextAlign.Center - ), + modifier = Modifier.padding(vertical = 2.dp), + color = Gray4_C5CAD2, + fontWeight = FontWeight(500), + style = DayoTheme.typography.caption2, ) } } From 5584e11ebab49336912c6bc185626a3a822e81e3 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 18 Mar 2026 21:51:14 +0900 Subject: [PATCH 6/6] [QA] Remove duplicate padding --- .../daily/dayo/presentation/screen/search/SearchResultScreen.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index 7cbe2514..24940a43 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -339,7 +339,6 @@ fun SearchResultEmpty() { Spacer(modifier = Modifier.height(2.dp)) Text( text = stringResource(id = R.string.search_result_empty_description), - modifier = Modifier.padding(vertical = 2.dp), color = Gray4_C5CAD2, fontWeight = FontWeight(500), style = DayoTheme.typography.caption2, @@ -366,7 +365,6 @@ fun SearchResultsCount(resultCount: Int = 0) { ) { Text( text = "$resultCount", - modifier = Modifier.padding(end = 2.dp), style = TextStyle( fontSize = 13.sp, lineHeight = 19.5.sp,