mirror of
https://github.com/Myzel394/NumberHub.git
synced 2025-06-19 00:35:26 +02:00
Fixed keyboard taking whole screen in landscape mode.
This commit is contained in:
parent
40b6e9c147
commit
02bf4a8497
@ -75,10 +75,10 @@ fun Keyboard(
|
|||||||
clearInput: () -> Unit = {},
|
clearInput: () -> Unit = {},
|
||||||
converterMode: ConverterMode,
|
converterMode: ConverterMode,
|
||||||
) {
|
) {
|
||||||
Crossfade(converterMode) {
|
Crossfade(converterMode, modifier = modifier) {
|
||||||
when (it) {
|
when (it) {
|
||||||
ConverterMode.DEFAULT -> DefaultKeyboard(modifier, addDigit, clearInput, deleteDigit)
|
ConverterMode.DEFAULT -> DefaultKeyboard(addDigit, clearInput, deleteDigit)
|
||||||
ConverterMode.BASE -> BaseKeyboard(modifier, addDigit, clearInput, deleteDigit)
|
ConverterMode.BASE -> BaseKeyboard(addDigit, clearInput, deleteDigit)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,14 +86,11 @@ fun Keyboard(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun DefaultKeyboard(
|
private fun DefaultKeyboard(
|
||||||
modifier: Modifier,
|
|
||||||
addDigit: (String) -> Unit,
|
addDigit: (String) -> Unit,
|
||||||
clearInput: () -> Unit,
|
clearInput: () -> Unit,
|
||||||
deleteDigit: () -> Unit
|
deleteDigit: () -> Unit
|
||||||
) {
|
) {
|
||||||
Column(
|
Column {
|
||||||
modifier = modifier.fillMaxSize()
|
|
||||||
) {
|
|
||||||
// Button modifier
|
// Button modifier
|
||||||
val bModifier = Modifier
|
val bModifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@ -140,14 +137,11 @@ private fun DefaultKeyboard(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun BaseKeyboard(
|
private fun BaseKeyboard(
|
||||||
modifier: Modifier,
|
|
||||||
addDigit: (String) -> Unit,
|
addDigit: (String) -> Unit,
|
||||||
clearInput: () -> Unit,
|
clearInput: () -> Unit,
|
||||||
deleteDigit: () -> Unit
|
deleteDigit: () -> Unit
|
||||||
) {
|
) {
|
||||||
Column(
|
Column {
|
||||||
modifier = modifier.fillMaxSize()
|
|
||||||
) {
|
|
||||||
// Button modifier
|
// Button modifier
|
||||||
val bModifier = Modifier
|
val bModifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user