diff --git a/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt b/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt index b7eb414062..1cc41acbf1 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/OutlinedSpinner.kt @@ -5,8 +5,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import com.tangem.blockchain.common.Blockchain import com.tangem.common.extensions.VoidCallback @@ -35,7 +33,7 @@ fun OutlinedSpinner( rSelectedItem.value = selectedItem.value } - val onItemSelectedInternal: (T) -> Unit = { + val onDropDownItemSelectedInternal: (T) -> Unit = { rSelectedItem.value = it rIsExpanded.value = false onItemSelected(it) @@ -49,23 +47,23 @@ fun OutlinedSpinner( expanded = rIsExpanded.value, onExpandedChange = { rIsExpanded.value = !rIsExpanded.value }, ) { - ProvideTextStyle(value = TextStyle(color = Color.Blue)) { - OutlinedTextField( - modifier = modifier, - readOnly = true, - enabled = isEnabled, - value = textFieldConverter(rSelectedItem.value), - onValueChange = {}, - label = { Text(label) }, - trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = rIsExpanded.value) }, - ) - } + OutlinedTextField( + modifier = modifier, + readOnly = true, + enabled = isEnabled, + value = textFieldConverter(rSelectedItem.value), + onValueChange = {}, + label = { Text(label) }, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = rIsExpanded.value) }, + ) + + if (!isEnabled) return@ExposedDropdownMenuBox ExposedDropdownMenu( expanded = rIsExpanded.value, onDismissRequest = onDismissRequest, ) { itemList.forEach { item -> - DropdownMenuItem(onClick = { onItemSelectedInternal(item) }) { + DropdownMenuItem(onClick = { onDropDownItemSelectedInternal(item) }) { when (dropdownItemView) { null -> Text(textFieldConverter(item)) else -> dropdownItemView(item)