feature/android-14 #48

Merged
fabian merged 2 commits from feature/android-14 into develop 2023-09-01 11:07:47 +02:00
Showing only changes of commit 57b02ce74a - Show all commits

View File

@@ -33,6 +33,7 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextField import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@@ -43,6 +44,7 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalTextInputService
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@@ -290,6 +292,7 @@ fun CenteredTextField(
} }
Box(contentAlignment = Alignment.Center) { Box(contentAlignment = Alignment.Center) {
CompositionLocalProvider(LocalTextInputService provides null) {
TextField( TextField(
value = value, value = value,
onValueChange = { }, onValueChange = { },
@@ -311,16 +314,18 @@ fun CenteredTextField(
onFocusStateChanged(it) onFocusStateChanged(it)
} }
) )
}
if (focused) { if (focused) {
val cursorColor = MaterialTheme.colorScheme.onSurface val cursorColor = MaterialTheme.colorScheme.onSurface
val infiniteTransition = rememberInfiniteTransition() val infiniteTransition = rememberInfiniteTransition(label = "blinkingCursor")
val alpha by infiniteTransition.animateFloat( val alpha by infiniteTransition.animateFloat(
0f, 0f,
cursorColor.alpha, cursorColor.alpha,
animationSpec = infiniteRepeatable( animationSpec = infiniteRepeatable(
animation = tween(500), animation = tween(500),
repeatMode = RepeatMode.Reverse repeatMode = RepeatMode.Reverse
) ), label = "blinkingCursor"
) )
Row { Row {