Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

feat: button to remove individual entries from search history #92

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ interface SearchDao {

@Query("DELETE from SearchQuery")
fun deleteAll()

@Query("DELETE from SearchQuery WHERE `query` = :query")
fun deleteQuery(query: String)
}
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ class LocalMusicRepository(

searchDao.addSearchQuery(SearchQuery(id = 0, query))
}
fun deleteQuery(query: String) = searchDao.deleteQuery(query)
fun getSearchHistory() = searchDao.getSearchHistory()

companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,6 @@ class PipedMusicRepository(

searchDao.addSearchQuery(SearchQuery(id = 0, query))
}
fun deleteQuery(query: String) = searchDao.deleteQuery(query)
fun getSearchHistory() = searchDao.getSearchHistory()
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ class LocalSearchViewModel(private val musicRepository: LocalMusicRepository) :
}
}

fun deleteFromHistory(query: String) {
musicRepository.deleteQuery(query)

history = history.minus(query)
}

companion object {
val Factory: ViewModelProvider.Factory = viewModelFactory {
initializer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowBack
import androidx.compose.material.icons.rounded.Clear
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.History
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -29,6 +31,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -131,7 +134,6 @@ fun LocalSearchScreen(
Column(
Modifier
.verticalScroll(scroll)
.padding(horizontal = 8.dp)
) {
if (localSearchViewModel.songSearchSuggestion.isNotEmpty()) {
Text(
Expand Down Expand Up @@ -164,6 +166,19 @@ fun LocalSearchScreen(
imageVector = Icons.Rounded.History,
contentDescription = null
)
},
trailingContent = {
IconButton(
modifier = Modifier.offset(x = 16.dp),
onClick = {
localSearchViewModel.deleteFromHistory(it)
}
) {
Icon(
imageVector = Icons.Rounded.Close,
contentDescription = null
)
}
}
)
}
Expand Down