release/2.0 #22

Merged
fabian merged 26 commits from release/2.0 into develop 2023-01-28 23:30:58 +01:00
Showing only changes of commit c71b608a7b - Show all commits

View File

@@ -49,22 +49,23 @@ fun Landscape(viewModel: ICounterViewModel) {
Modifier.weight(1f) Modifier.weight(1f)
) )
} }
if (!viewModel.keyboardHidden) {
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
KeyboardView( KeyboardView(
viewModel.currentScoreA, viewModel.currentScoreA,
viewModel.currentScoreB, viewModel.currentScoreB,
viewModel.requestFocusA, viewModel.requestFocusA,
viewModel.enableSubmit, viewModel.enableSubmit,
{ viewModel.updateFocusStateA(it) }, { viewModel.updateFocusStateA(it) },
{ viewModel.updateFocusStateB(it) }, { viewModel.updateFocusStateB(it) },
{ viewModel.digitClicked(it) }, { viewModel.digitClicked(it) },
{ viewModel.addSub100Clicked(it) }, { viewModel.addSub100Clicked(it) },
{ viewModel.deleteClicked() }, { viewModel.deleteClicked() },
{ viewModel.negateClicked() }, { viewModel.negateClicked() },
{ viewModel.submitClicked() }, { viewModel.submitClicked() },
{ viewModel.keyboardHidden = true }, { viewModel.keyboardHidden = true },
{ viewModel.swapInputScores() }) { viewModel.swapInputScores() })
}
} }
} }
} }