Skip to content

Add Search history empty view #657

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
DongJun-H merged 2 commits into from
Jun 3, 2025
Merged

Add Search history empty view #657

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
d48cc4d
Add Search history empty view
DongJun-H May 25, 2025
1f25b02
Add missing spacer in empty views
DongJun-H Jun 2, 2025
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
1 change: 1 addition & 0 deletions presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ fun SearchResultEmpty() {
imageVector = ImageVector.vectorResource(id = R.drawable.ic_search_empty),
contentDescription = "search tag empty"
)
Spacer(modifier = Modifier.height(20.dp))
Text(
text = stringResource(R.string.search_result_empty_title),
style = DayoTheme.typography.b3
Expand Down
81 changes: 63 additions & 18 deletions presentation/src/main/java/daily/dayo/presentation/screen/search/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package daily.dayo.presentation.screen.search

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
Expand Down Expand Up @@ -37,9 +39,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
Expand All @@ -58,6 +62,8 @@ import daily.dayo.presentation.R
import daily.dayo.presentation.common.extension.clickableSingle
import daily.dayo.presentation.common.toSp
import daily.dayo.presentation.theme.DayoTheme
import daily.dayo.presentation.theme.Gray3_9FA5AE
import daily.dayo.presentation.theme.Gray4_C5CAD2
import daily.dayo.presentation.view.NoRippleIconButton
import daily.dayo.presentation.viewmodel.SearchViewModel
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -118,14 +124,12 @@ fun SearchScreen(
onBackClick = onBackClick,
onSearchClick = onSearchClick
)
searchHistory.let {
SetSearchHistoryLayout(
onKeywordClick = onSearchClick,
onKeywordDeleteClick = onKeywordDeleteClick,
onHistoryClearClick = onHistoryClearClick,
searchHistory = it
)
}
SetSearchHistoryLayout(
onKeywordClick = onSearchClick,
onKeywordDeleteClick = onKeywordDeleteClick,
onHistoryClearClick = onHistoryClearClick,
searchHistory = searchHistory
)
}
}
}
Expand Down Expand Up @@ -299,19 +303,60 @@ private fun SetSearchHistoryLayout(
item {
SearchHistoryGuideLayout()
}
items(searchHistory.data) {
SearchHistoryLayout(
onKeywordClick = onKeywordClick,
onKeywordDeleteClick = onKeywordDeleteClick,
searchHistoryDetail = it
)
}
item {
SetClearSearchHistoryLayout(onHistoryClearClick = onHistoryClearClick)

if (searchHistory.data.isNotEmpty()) {
items(searchHistory.data) {
SearchHistoryLayout(
onKeywordClick = onKeywordClick,
onKeywordDeleteClick = onKeywordDeleteClick,
searchHistoryDetail = it
)
}
item {
SetClearSearchHistoryLayout(onHistoryClearClick = onHistoryClearClick)
}
} else {
item {
Box(
modifier = Modifier
.fillParentMaxHeight()
.fillMaxWidth(),
Comment on lines +322 to +323
Copy link

Copilot AI May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider using Modifier.fillMaxSize() instead of fillParentMaxHeight() for consistency and clarity, if that aligns with other layouts in the project.

Suggested change
.fillParentMaxHeight()
.fillMaxWidth(),
.fillMaxSize(),

Copilot uses AI. Check for mistakes.
contentAlignment = Alignment.Center
) {
SearchHistoryEmpty()
}
}
}
}
}

@Composable
@Preview
fun SearchHistoryEmpty() {
Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
Image(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_search_empty),
contentDescription = "search history empty"
)
Spacer(modifier = Modifier.height(20.dp))
Text(
text = stringResource(R.string.search_history_empty_title),
style = DayoTheme.typography.b3,
color = Gray3_9FA5AE,
)
Text(
modifier = Modifier.padding(vertical = 2.dp),
text = stringResource(id = R.string.search_history_empty_description),
style = DayoTheme.typography.caption2,
color = Gray4_C5CAD2,
)
}
}

@Composable
private fun SearchHistoryLayout(
onKeywordClick: (String) -> Unit,
Expand Down Expand Up @@ -352,7 +397,7 @@ private fun SearchHistoryLayout(
@Preview
private fun PreviewSearchHistoryLayout() {
SearchHistoryLayout(
onKeywordClick = { _, -> },
onKeywordClick = { _ -> },
onKeywordDeleteClick = { _, _ -> },
searchHistoryDetail = SearchHistoryDetail(
history = "검색어",
Expand Down
2 changes: 2 additions & 0 deletions presentation/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@
<string name="search_result_empty_title">앗! 찾으시는 검색 결과가 없어요.</string>
<string name="search_result_empty_description">다른 검색어를 입력해보세요</string>
<string name="search_history_clear">검색 기록 지우기</string>
<string name="search_history_empty_title">최근 검색 결과가 없어요.</string>
Comment thread
DongJun-H marked this conversation as resolved.
<string name="search_history_empty_description">관심있는 키워드 또는 사용자를 찾아보세요</string>

<!-- Certificate-->
<string name="get_certificate_code">인증번호 받기</string>
Expand Down