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

Use alternative modifiers for keyboard

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/KeyboardButton.kt
View File

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

4
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
View File

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