Skip to content

Search by keyword problems #607

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
eslam-99 merged 2 commits into from
Aug 19, 2025
Merged

Search by keyword problems #607

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
e7da537
fix: resolve state while clicking on any recent search to be loading …
ThoriaHamdy99 Aug 19, 2025
9d1e8dc
fix: resolve the recent searches flashes while typing spaces on the s…
ThoriaHamdy99 Aug 19, 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
4 changes: 3 additions & 1 deletion ui/src/main/java/com/amsterdam/ui/screens/search/keywordSearch/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ private fun SearchContent(
)

RecentSearchesSection(
state = state,
recentSearches = state.recentSearches,
isLoading = state.isLoading,
keyword = state.keyword.trim(),
onAllRecentSearchesCleared = interactionListener::onClickClearAllRecentSearches,
onRecentSearchClicked = interactionListener::onClickRecentSearch,
onRecentSearchCleared = interactionListener::onClickClearRecentSearch
Expand Down
31 changes: 17 additions & 14 deletions ...main/java/com/amsterdam/ui/screens/search/keywordSearch/sections/RecentSearchesSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,30 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.amsterdam.ui.R
import com.amsterdam.designsystem.components.LoadingContainer
import com.amsterdam.designsystem.components.Text
import com.amsterdam.designsystem.components.divider.HorizontalDivider
import com.amsterdam.designsystem.theme.AppTheme
import com.amsterdam.viewmodel.search.keywordSearch.SearchUiState
import com.amsterdam.ui.R

@Composable
internal fun RecentSearchesSection(
state: SearchUiState,
modifier: Modifier = Modifier,
recentSearches: List<String> = emptyList(),
keyword: String = "",
isLoading: Boolean = false,
onAllRecentSearchesCleared: () -> Unit,
onRecentSearchClicked: (String) -> Unit,
onRecentSearchCleared: (String) -> Unit,
modifier: Modifier = Modifier,
) {
AnimatedContent(
targetState = state,
targetState = keyword,
transitionSpec = {
fadeIn(animationSpec = tween(1700)) togetherWith fadeOut(animationSpec = tween(1700))
},
) {
) { searchKeyword ->
when {
it.recentSearches.isNotEmpty() && it.keyword.isBlank() -> {
recentSearches.isNotEmpty() && searchKeyword.isBlank() -> {
Column(
modifier = modifier
.fillMaxWidth()
Expand Down Expand Up @@ -78,19 +79,19 @@ internal fun RecentSearchesSection(
.fillMaxWidth()
.padding(top = 12.dp)
) {
it.recentSearches.map { recentSearchItem ->
recentSearches.map { recentSearchItem ->
RecentSearchItem(
title = recentSearchItem,
onItemClick = onRecentSearchClicked,
onCancelClick = onRecentSearchCleared,
)
if (recentSearchItem != it.recentSearches.last()) HorizontalDivider()
if (recentSearchItem != recentSearches.last()) HorizontalDivider()
}
}
}
}

it.keyword.isBlank() && it.recentSearches.isEmpty() && !it.isLoading -> {
searchKeyword.isBlank() && recentSearches.isEmpty() && !isLoading -> {
val topPadding =
if (LocalConfiguration.current.orientation == ORIENTATION_LANDSCAPE) {
12.dp
Expand All @@ -104,10 +105,12 @@ internal fun RecentSearchesSection(
)
}

it.isLoading -> {
LoadingContainer(modifier = modifier
.fillMaxSize()
.padding(top = 48.dp))
isLoading -> {
LoadingContainer(
modifier = modifier
.fillMaxSize()
.padding(top = 48.dp)
)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion viewModel/src/main/java/com/amsterdam/viewmodel/search/keywordSearch/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,10 @@ class SearchViewModel @Inject constructor(
onSearchKeywordChanged(_keyword.value)
}

override fun onClickRecentSearch(keyword: String) = onChangeSearchKeyword(keyword)
override fun onClickRecentSearch(keyword: String){
startLoading(true)
onChangeSearchKeyword(keyword)
}

override fun onClickClearRecentSearch(keyword: String) {
tryToExecute(
Expand Down