Skip to content
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

상징 선택 페이지 검색 기능 향상 #39

Merged
merged 5 commits into from
Nov 12, 2023
Merged

상징 선택 페이지 검색 기능 향상 #39

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
432d08e
:bug: Fix screen error when updating favorites
sukchan-0811 Nov 11, 2023
7749414
:children_crossing: Improve search
sukchan-0811 Nov 11, 2023
91f285d
:art: Update frontend/app/src/main/java/com/example/speechbuddy/viewm…
sukchan-0811 Nov 12, 2023
c3f73e4
:art: Update frontend/app/src/main/java/com/example/speechbuddy/viewm…
sukchan-0811 Nov 12, 2023
a88bca3
:art: Update frontend/app/src/main/java/com/example/speechbuddy/viewm…
sukchan-0811 Nov 12, 2023
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
79 changes: 49 additions & 30 deletions frontend/app/src/main/java/com/example/speechbuddy/viewmodel/SymbolSelectionViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.example.speechbuddy.ui.models.DisplayMode
import com.example.speechbuddy.ui.models.SymbolItem
import com.example.speechbuddy.ui.models.SymbolSelectionUiState
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
Expand All @@ -41,10 +42,10 @@ class SymbolSelectionViewModel @Inject internal constructor(
private val _entries = MutableLiveData<List<Entry>>()
val entries: LiveData<List<Entry>> get() = _entries

private var getEntriesJob: Job? = null

init {
viewModelScope.launch {
getEntries()
}
getEntries()
}

fun expandMenu() {
Expand All @@ -69,16 +70,16 @@ class SymbolSelectionViewModel @Inject internal constructor(
isMenuExpanded = false, displayMode = displayMode
)
}
viewModelScope.launch {
getEntries()
}
getEntries()
}

fun setQuery(input: String) {
queryInput = input
viewModelScope.launch {
getEntries()
}
/**
* Passes a new queryInput to getEntries() to ensure that
* getEntries() is called precisely because of a change in query
*/
getEntries(input)
}

fun clear(symbolItem: SymbolItem) {
Expand All @@ -90,6 +91,7 @@ class SymbolSelectionViewModel @Inject internal constructor(
}

fun selectSymbol(symbol: Symbol) {
queryInput = ""
selectedSymbols =
selectedSymbols.plus(SymbolItem(id = selectedSymbols.size, symbol = symbol))
}
Expand All @@ -103,42 +105,59 @@ class SymbolSelectionViewModel @Inject internal constructor(
fun selectCategory(category: Category) {
if (category != selectedCategory) {
selectedCategory = category
viewModelScope.launch {
getEntriesJob?.cancel()
getEntriesJob = viewModelScope.launch {
repository.getSymbolsByCategory(category).collect { symbols ->
_entries.postValue(listOf(category) + symbols)
}
}
} else {
selectedCategory = null
viewModelScope.launch {
getEntries()
}
getEntries()
}
}

private suspend fun getEntries() {
when (_uiState.value.displayMode) {
DisplayMode.ALL -> {
repository.getEntries(queryInput).collect { entries ->
_entries.postValue(entries)
private fun getEntries(query: String? = null) {
getEntriesJob?.cancel()
getEntriesJob = viewModelScope.launch {
when (_uiState.value.displayMode) {
DisplayMode.ALL -> {
repository.getEntries(queryInput).collect { entries ->
_entries.postValue(entries)
}
}
}

DisplayMode.SYMBOL -> {
repository.getSymbols(queryInput).collect { symbols ->
_entries.postValue(symbols)
/**
* In case of DisplayMode.SYMBOL and DisplayMode.CATEGORY,
* if getEntries() is called by setQuery(),
* retrieve both symbols and categories from the repository
*/
DisplayMode.SYMBOL -> {
if (query != null) // called from setQuery()
repository.getEntries(query).collect { symbols ->
_entries.postValue(symbols)
sukchan-0811 marked this conversation as resolved.
Show resolved Hide resolved
}
else // called from somewhere else
repository.getSymbols(queryInput).collect { entries ->
_entries.postValue(entries)
sukchan-0811 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

DisplayMode.CATEGORY -> {
repository.getCategories(queryInput).collect { categories ->
_entries.postValue(categories)
DisplayMode.CATEGORY -> {
if (query != null)
repository.getEntries(query).collect { symbols ->
_entries.postValue(symbols)
sukchan-0811 marked this conversation as resolved.
Show resolved Hide resolved
}
else
repository.getCategories(queryInput).collect { categories ->
_entries.postValue(categories)
}
}
}

DisplayMode.FAVORITE -> {
repository.getFavoriteSymbols(queryInput).collect { symbols ->
_entries.postValue(symbols)
DisplayMode.FAVORITE -> {
repository.getFavoriteSymbols(queryInput).collect { symbols ->
_entries.postValue(symbols)
}
}
}
}
Expand Down