diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt index c85e62ee..675dbba3 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt @@ -70,6 +70,7 @@ internal fun MyTextField( secondaryText: String?, helperText: String, textToCopy: String, + onClick: () -> Unit = {}, ) { val clipboardManager = LocalClipboardManager.current val mc = LocalContext.current @@ -82,7 +83,7 @@ internal fun MyTextField( .combinedClickable( interactionSource = remember { MutableInteractionSource() }, indication = rememberRipple(), - onClick = {}, + onClick = onClick, onLongClick = { clipboardManager.setText(AnnotatedString(secondaryText ?: textToShow)) Toast diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt index 237b6695..fae0d311 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt @@ -21,7 +21,6 @@ package com.sadellie.unitto.feature.converter.components import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.tween -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -42,8 +41,8 @@ import androidx.compose.ui.draw.rotate import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.ui.Formatter -import com.sadellie.unitto.data.units.AbstractUnit import com.sadellie.unitto.core.ui.R +import com.sadellie.unitto.data.units.AbstractUnit import com.sadellie.unitto.data.units.UnitGroup import com.sadellie.unitto.feature.converter.ConverterMode @@ -107,9 +106,8 @@ internal fun TopScreenPart( textToCopy = calculatedValue ?: inputValue, ) MyTextField( - modifier = Modifier - .fillMaxWidth() - .clickable(onClick = onOutputTextFieldClick), + modifier = Modifier.fillMaxWidth(), + onClick = onOutputTextFieldClick, primaryText = { when { networkLoading -> stringResource(R.string.loading_label)