Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: keyboard popping up in calculator #24

Merged
merged 1 commit into from
Jan 1, 2024
Merged

fix: keyboard popping up in calculator #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions app/src/main/java/net/youapps/calcyou/ui/components/CalculatorDisplay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalTextInputService
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -62,23 +64,25 @@ fun ColumnScope.CalculatorDisplay(calculatorViewModel: CalculatorViewModel) {
.background(MaterialTheme.colorScheme.surfaceColorAtElevation(50.dp)),
horizontalArrangement = Arrangement.End
) {
BasicTextField(
value = calculatorViewModel.displayText,
onValueChange = {
calculatorViewModel.displayText = it
},
singleLine = true,
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp, horizontal = 16.dp),
maxLines = 1,
textStyle = MaterialTheme.typography.displayMedium.plus(
TextStyle(
textAlign = TextAlign.End,
color = MaterialTheme.colorScheme.onSurface
CompositionLocalProvider(LocalTextInputService provides null) {
BasicTextField(
value = calculatorViewModel.displayText,
onValueChange = {
calculatorViewModel.displayText = it
},
singleLine = true,
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 8.dp, horizontal = 16.dp),
maxLines = 1,
textStyle = MaterialTheme.typography.displayMedium.plus(
TextStyle(
textAlign = TextAlign.End,
color = MaterialTheme.colorScheme.onSurface
)
)
)
)
}
}
}

Expand Down