Skip to content

fix(search): use of xml strings in search filter instead of hardcoded values #2621

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
amanna13 wants to merge 2 commits into
base: development
Choose a base branch
from
+48 −39
Open

fix(search): use of xml strings in search filter instead of hardcoded values #2621

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
60f0b72
refactor(search): use of xml strings instead of hardcoded values
amanna13 Feb 22, 2026
915e0ce
Merge branch 'development' into refactor/xml-string-search
amanna13 Feb 23, 2026
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
20 changes: 5 additions & 15 deletions feature/search/src/commonMain/composeResources/values-es/feature_search_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,9 @@
<string name="feature_search_close">Cerrar</string>
<string name="feature_search_all">Todos</string>

<string-array name="feature_search_filter_options">
<item>Clientes</item>
<item>Grupos</item>
<item>Centros</item>
<item>Cuentas de préstamo</item>
<item>Cuentas de ahorro</item>
</string-array>

<string-array name="feature_search_filter_option_values">
<item>clients</item>
<item>groups</item>
<item>centers</item>
<item>loans</item>
<item>savingsaccounts</item>
</string-array>
<string name="feature_search_filter_options_clients_label">Clientes</string>
<string name="feature_search_filter_options_groups_label">Grupos</string>
<string name="feature_search_filter_options_centers_label">Centros</string>
<string name="feature_search_filter_options_loans_label">Cuentas de préstamo</string>
<string name="feature_search_filter_options_savings_label">Cuentas de ahorro</string>
</resources>
25 changes: 10 additions & 15 deletions feature/search/src/commonMain/composeResources/values/feature_search_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,14 @@
<string name="feature_search_close">Close</string>
<string name="feature_search_all">All</string>

<string-array name="feature_search_filter_options">
<item>Clients</item>
<item>Groups</item>
<item>Centers</item>
<item>Loan Accounts</item>
<item>Savings Accounts</item>
</string-array>

<string-array name="feature_search_filter_option_values">
Copy link
Member

@therajanmaurya therajanmaurya Feb 22, 2026

Choose a reason for hiding this comment

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

Why removed string array?

Copy link
Member Author

@amanna13 amanna13 Feb 22, 2026

Choose a reason for hiding this comment

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

The string-array was originally introduced during "Migrate Search Fragment To Compose"
The filter options are mainly structured data of the

  • label (these are localized)
  • values (these are the constants - localization not needed)

I believe using string-array in this context would introduce additional complexity. It would be depended on the positional indexing between the two arrays.

<item>clients</item>
<item>groups</item>
<item>centers</item>
<item>loans</item>
<item>savingsaccounts</item>
</string-array>
<string name="feature_search_filter_options_clients_label">Clients</string>
<string name="feature_search_filter_options_clients_value" translatable="false">clients</string>
<string name="feature_search_filter_options_groups_label">Groups</string>
<string name="feature_search_filter_options_groups_value" translatable="false">groups</string>
<string name="feature_search_filter_options_centers_label">Centers</string>
<string name="feature_search_filter_options_centers_value" translatable="false">centers</string>
<string name="feature_search_filter_options_loans_label">Loan Accounts</string>
<string name="feature_search_filter_options_loans_value" translatable="false">loans</string>
<string name="feature_search_filter_options_savings_label">Savings Accounts</string>
<string name="feature_search_filter_options_savings_value" translatable="false">savingsaccounts</string>
</resources>
36 changes: 29 additions & 7 deletions feature/search/src/commonMain/kotlin/com/mifos/feature/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
*/
package com.mifos.feature.search

import androidclient.feature.search.generated.resources.Res
import androidclient.feature.search.generated.resources.feature_search_filter_options_clients_label
import androidclient.feature.search.generated.resources.feature_search_filter_options_clients_value
import androidclient.feature.search.generated.resources.feature_search_filter_options_groups_label
import androidclient.feature.search.generated.resources.feature_search_filter_options_groups_value
import androidclient.feature.search.generated.resources.feature_search_filter_options_loans_label
import androidclient.feature.search.generated.resources.feature_search_filter_options_loans_value
import androidclient.feature.search.generated.resources.feature_search_filter_options_savings_label
import androidclient.feature.search.generated.resources.feature_search_filter_options_savings_value
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand All @@ -24,6 +33,8 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.StringResource
import org.jetbrains.compose.resources.getString

class SearchViewModel(
private val searchRepository: SearchRepository,
Expand Down Expand Up @@ -96,7 +107,7 @@ class SearchViewModel(
state.value = state.value.copy(showEmptyError = false)
searchJob = searchRepository.searchResources(
query = state.value.searchText,
resources = state.value.selectedFilter?.value,
resources = state.value.selectedFilter?.let { getString(it.valueRes) },
exactMatch = state.value.exactMatch,
).onStart {
searchResultState.update { SearchResultState.Loading }
Expand Down Expand Up @@ -157,16 +168,27 @@ sealed interface SearchScreenEvent {
data object PerformSearch : SearchScreenEvent
}

sealed class FilterOption(val label: String, val value: String) {
sealed class FilterOption(val labelRes: StringResource, val valueRes: StringResource) {

data object Clients : FilterOption(label = "Clients", value = "clients")
data object Clients : FilterOption(
labelRes = Res.string.feature_search_filter_options_clients_label,
valueRes = Res.string.feature_search_filter_options_clients_value,
)

data object Groups : FilterOption(label = "Groups", value = "groups")
data object Groups : FilterOption(
labelRes = Res.string.feature_search_filter_options_groups_label,
valueRes = Res.string.feature_search_filter_options_groups_value,
)

data object LoanAccounts : FilterOption(label = "Loan Accounts", value = "loans")
data object LoanAccounts : FilterOption(
labelRes = Res.string.feature_search_filter_options_loans_label,
valueRes = Res.string.feature_search_filter_options_loans_value,
)

data object SavingsAccounts :
FilterOption(label = "Savings Accounts", value = "savingsaccounts")
data object SavingsAccounts : FilterOption(
labelRes = Res.string.feature_search_filter_options_savings_label,
valueRes = Res.string.feature_search_filter_options_savings_value,
)

companion object {
val values = listOf(Clients, Groups, LoanAccounts, SavingsAccounts)
Expand Down
2 changes: 1 addition & 1 deletion feature/search/src/commonMain/kotlin/com/mifos/feature/search/components/FilterDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ internal fun FilterDialog(
HorizontalDivider()
FilterOption.values.forEachIndexed { index, option ->
FilterOption(
text = option.label,
text = stringResource(option.labelRes),
selected = option == selectedFilter,
onSelected = {
selectedFilter = option
Expand Down
4 changes: 3 additions & 1 deletion feature/search/src/commonMain/kotlin/com/mifos/feature/search/components/SearchBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package com.mifos.feature.search.components

import androidclient.feature.search.generated.resources.Res
import androidclient.feature.search.generated.resources.feature_search_all
import androidclient.feature.search.generated.resources.feature_search_empty_input_field
import androidclient.feature.search.generated.resources.feature_search_exact_match
import androidclient.feature.search.generated.resources.feature_search_search_hint
Expand Down Expand Up @@ -83,7 +84,8 @@ internal fun SearchBox(
},
label = {
Text(
text = state.selectedFilter?.label ?: "All",
text = state.selectedFilter?.let { stringResource(it.labelRes) }
?: stringResource(Res.string.feature_search_all),
style = MaterialTheme.typography.bodyLarge,
)
},
Expand Down