Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 00:35:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed text field clickable area

Browse Source
This commit is contained in:
Sad Ellie 2023-01-28 15:16:32 +04:00
parent 8de96041d5
commit f8461638d4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt
View File

@ -70,6 +70,7 @@ internal fun MyTextField(
secondaryText: String?, secondaryText: String?,
helperText: String, helperText: String,
textToCopy: String, textToCopy: String,
onClick: () -> Unit = {},
) { ) {
val clipboardManager = LocalClipboardManager.current val clipboardManager = LocalClipboardManager.current
val mc = LocalContext.current val mc = LocalContext.current
@ -82,7 +83,7 @@ internal fun MyTextField(
.combinedClickable( .combinedClickable(
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(), indication = rememberRipple(),
onClick = {}, onClick = onClick,
onLongClick = { onLongClick = {
clipboardManager.setText(AnnotatedString(secondaryText ?: textToShow)) clipboardManager.setText(AnnotatedString(secondaryText ?: textToShow))
Toast Toast

8
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt
View File

@ -21,7 +21,6 @@ package com.sadellie.unitto.feature.converter.components
import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row 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.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.Formatter 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.core.ui.R
import com.sadellie.unitto.data.units.AbstractUnit
import com.sadellie.unitto.data.units.UnitGroup import com.sadellie.unitto.data.units.UnitGroup
import com.sadellie.unitto.feature.converter.ConverterMode import com.sadellie.unitto.feature.converter.ConverterMode
@ -107,9 +106,8 @@ internal fun TopScreenPart(
textToCopy = calculatedValue ?: inputValue, textToCopy = calculatedValue ?: inputValue,
) )
MyTextField( MyTextField(
modifier = Modifier modifier = Modifier.fillMaxWidth(),
.fillMaxWidth() onClick = onOutputTextFieldClick,
.clickable(onClick = onOutputTextFieldClick),
primaryText = { primaryText = {
when { when {
networkLoading -> stringResource(R.string.loading_label) networkLoading -> stringResource(R.string.loading_label)