Skip to content

feat: added swipe-to-delete from search history #1697

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: added swipe-to-delete from search history #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 47 additions & 35 deletions android/src/main/kotlin/project/pipepipe/app/ui/screens/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,45 +322,57 @@ fun SearchScreen(
.fillMaxSize()
.background(MaterialTheme.colorScheme.background)
) {
items(uiState.searchSuggestionList) { suggestion ->
Row(
modifier = Modifier
.fillMaxWidth()
.height(40.dp)
.clickable {
viewModel.updateSearchQuery(suggestion.text)
performSearch(suggestion.text)
}
.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically
itemsIndexed(
items = uiState.searchSuggestionList,
key = { i, suggestion -> suggestion.text + i }
) { _, suggestion ->
val dismissState = rememberSwipeToDismissBoxState()

SwipeToDismissBox(
state = dismissState,
backgroundContent = {},
onDismiss = { viewModel.removeLocalSuggestion(suggestion.text) },
gesturesEnabled = suggestion.isLocal
) {
Icon(
if (suggestion.isLocal)Icons.Default.History else Icons.Default.Search,
contentDescription = if (suggestion.isLocal) stringResource(MR.strings.title_activity_history) else stringResource(MR.strings.search),
modifier = Modifier.size(22.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant
)

Text(
text = suggestion.text,
modifier = Modifier
.weight(1f)
.padding(horizontal = 16.dp),
fontSize = 13.5.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Icon(
Icons.Default.NorthWest,
contentDescription = stringResource(MR.strings.fill_search),
Row(
modifier = Modifier
.size(21.dp)
.fillMaxWidth()
.height(40.dp)
.clickable {
viewModel.updateSearchQuery(suggestion.text)
focusRequester.requestFocus()
},
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
performSearch(suggestion.text)
}
.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
if (suggestion.isLocal) Icons.Default.History else Icons.Default.Search,
contentDescription = if (suggestion.isLocal) stringResource(MR.strings.title_activity_history) else stringResource(MR.strings.search),
modifier = Modifier.size(22.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant
)

Text(
text = suggestion.text,
modifier = Modifier
.weight(1f)
.padding(horizontal = 16.dp),
fontSize = 13.5.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Icon(
Icons.Default.NorthWest,
contentDescription = stringResource(MR.strings.fill_search),
modifier = Modifier
.size(21.dp)
.clickable {
viewModel.updateSearchQuery(suggestion.text)
focusRequester.requestFocus()
},
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions android/src/main/kotlin/project/pipepipe/app/ui/viewmodel/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ class SearchViewModel : ViewModel() {
}
}

fun removeLocalSuggestion(suggestionText: String) {
viewModelScope.launch {
sharedViewModel.removeLocalSuggestion(suggestionText)
}
}

fun updateSelectedService(service: SupportedServiceInfo) {
sharedViewModel.updateSelectedService(service)
}
Expand Down
15 changes: 15 additions & 0 deletions library/src/commonMain/kotlin/project/pipepipe/app/viewmodel/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@ class SearchViewModel() : BaseViewModel<SearchUiState>(SearchUiState()) {
}
}

suspend fun removeLocalSuggestion(suggestionText: String) {
DatabaseOperations.getSearchHistory()
.find { it.search == suggestionText }?.let { removedSuggestion ->
val result = DatabaseOperations.deleteSearchHistory(removedSuggestion.id)

if (result.value == 1L) {
setState {
it.copy(
searchSuggestionList = it.searchSuggestionList.filterNot { suggestion -> suggestion.text == suggestionText }
)
}
}
}
}

fun updateSelectedService(service: SupportedServiceInfo) {
if (service == uiState.value) {
return
Expand Down