Skip to content

Fix: Filter dialog confirmation button #2537

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
merged 5 commits into from
Nov 21, 2025
Merged

Fix: Filter dialog confirmation button #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f61f53
fixed filter dialog confirm button
Nov 6, 2025
d98f2f8
Merge branch 'development' into fix/search-filter-dialog
shashank-0-0 Nov 10, 2025
7a3e801
Moved hardcoded string to String resources
Nov 11, 2025
f79d191
Merge branch 'development' into fix/search-filter-dialog
shashank-0-0 Nov 11, 2025
4a47d95
Merge branch 'development' into fix/search-filter-dialog
shashank-0-0 Nov 21, 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
3 changes: 3 additions & 0 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 @@ -18,6 +18,9 @@

<string name="feature_search_search_options_clients_label">Clients</string>
<string name="feature_search_search_options_clients_value">clients</string>
<string name="feature_search_apply">Apply</string>
<string name="feature_search_close">Close</string>
<string name="feature_search_all">All</string>

<string-array name="feature_search_filter_options">
<item>Clients</item>
Expand Down
30 changes: 20 additions & 10 deletions 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 @@ -10,6 +10,9 @@
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_apply
import androidclient.feature.search.generated.resources.feature_search_close
import androidclient.feature.search.generated.resources.feature_search_filter
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
Expand All @@ -22,6 +25,10 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.unit.sp
Expand All @@ -38,12 +45,17 @@ internal fun FilterDialog(
onDismiss: () -> Unit,
modifier: Modifier = Modifier,
) {
var selectedFilter by remember { mutableStateOf(selected) }

MifosDialogBox(
title = stringResource(Res.string.feature_search_filter),
showDialogState = true,
confirmButtonText = "",
dismissButtonText = "Close",
onConfirm = {},
confirmButtonText = stringResource(Res.string.feature_search_apply),
dismissButtonText = stringResource(Res.string.feature_search_close),
onConfirm = {
onEvent(SearchScreenEvent.UpdateSelectedFilter(selectedFilter))
onDismiss()
},
onDismiss = onDismiss,
modifier = modifier,
message = {
Expand All @@ -54,21 +66,19 @@ internal fun FilterDialog(
) {
HorizontalDivider()
FilterOption(
text = "All",
selected = selected == null,
text = stringResource(Res.string.feature_search_all),
selected = selectedFilter == null,
onSelected = {
onEvent(SearchScreenEvent.UpdateSelectedFilter(null))
onDismiss()
selectedFilter = null
},
)
HorizontalDivider()
FilterOption.values.forEachIndexed { index, option ->
FilterOption(
text = option.label,
selected = option == selected,
selected = option == selectedFilter,
onSelected = {
onEvent(SearchScreenEvent.UpdateSelectedFilter(option))
onDismiss()
selectedFilter = option
},
)
if (index != FilterOption.values.size - 1) {
Expand Down