Use alternative modifiers for keyboard

This commit is contained in:
Sad Ellie 2023-12-12 10:36:31 +03:00
parent f623e989e5
commit 0793f0a19b
2 changed files with 10 additions and 3 deletions

View File

@ -29,8 +29,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalView import androidx.compose.ui.platform.LocalView
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -71,7 +71,12 @@ fun BasicKeyboardButton(
Icon( Icon(
imageVector = icon, imageVector = icon,
contentDescription = null, contentDescription = null,
modifier = Modifier.matchParentSize().scale(contentHeight), modifier = Modifier
.matchParentSize()
.graphicsLayer {
scaleX = contentHeight
scaleY = contentHeight
},
tint = iconColor tint = iconColor
) )
} }

View File

@ -59,6 +59,7 @@ import androidx.compose.ui.semantics.testTag
import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -79,6 +80,7 @@ import com.sadellie.unitto.feature.calculator.components.TextBox
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
import kotlin.math.roundToInt
@Composable @Composable
internal fun CalculatorRoute( internal fun CalculatorRoute(
@ -272,7 +274,7 @@ private fun Ready(
CalculatorKeyboard( CalculatorKeyboard(
modifier = Modifier modifier = Modifier
.semantics { testTag = "ready" } .semantics { testTag = "ready" }
.offset(y = historyListHeight + textBoxHeight) .offset { IntOffset(x = 0, y = (historyListHeight + textBoxHeight).toPx().roundToInt()) }
.height(keyboardHeight) .height(keyboardHeight)
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 8.dp, vertical = 4.dp), .padding(horizontal = 8.dp, vertical = 4.dp),