[ANDROAPP-5800] fix code smells

dhis2 · Feb 14, 2024 · 5b68161 · 5b68161
1 parent 8ad122c
commit 5b68161
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt
@@ -427,7 +427,7 @@ class SearchTEIViewModel(
                     minAttributesToSearch,
                 )
                 uiState = uiState.copy(minAttributesMessage = message)
-                uiState.shouldShowMinAttributeWarning.emit(true)
+                uiState.updateMinAttributeWarning(true)
             }
         }
     }

diff --git a/...a/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt b/...a/org/dhis2/usescases/searchTrackEntity/searchparameters/model/SearchParametersUiState.kt
@@ -1,10 +1,17 @@
 package org.dhis2.usescases.searchTrackEntity.searchparameters.model
 
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
 import org.dhis2.form.model.FieldUiModel
 
 data class SearchParametersUiState(
     val items: List<FieldUiModel> = listOf(),
     val minAttributesMessage: String? = null,
-    val shouldShowMinAttributeWarning: MutableSharedFlow<Boolean> = MutableSharedFlow(),
-)
+    private val _shouldShowMinAttributeWarning: MutableSharedFlow<Boolean> = MutableSharedFlow(),
+) {
+    val shouldShowMinAttributeWarning: SharedFlow<Boolean> = _shouldShowMinAttributeWarning
+
+    suspend fun updateMinAttributeWarning(showWarning: Boolean) {
+        _shouldShowMinAttributeWarning.emit(showWarning)
+    }
+}
diff --git a/...s2/usescases/searchTrackEntity/searchparameters/provider/ParameterSelectorItemProvider.kt b/...s2/usescases/searchTrackEntity/searchparameters/provider/ParameterSelectorItemProvider.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.graphics.vector.ImageVector
+import org.dhis2.R
 import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.UiRenderType
@@ -42,7 +43,7 @@ fun provideParameterSelectorItem(
     return ParameterSelectorItemModel(
         icon = provideIcon(fieldUiModel.valueType, fieldUiModel.renderingType),
         label = fieldUiModel.label,
-        helper = "Optional",
+        helper = resources.getString(R.string.optional),
         inputField = {
             FieldProvider(
                 modifier = Modifier,

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -969,4 +969,5 @@
     <string name="remove_enrollment_dialog_title">Remove from %s?</string>
     <string name="remove_enrollment_dialog_message">Data from %s will de deleted. This action cannot be undone.</string>
     <string name="clear_search">\"Clear search\"</string>
+    <string name="optional">Optional</string>
 </resources>