minor bugfix

This commit is contained in:
2026-05-17 11:12:36 +03:00
parent 84567bebaa
commit 3637a1e236
5 changed files with 28 additions and 23 deletions
+2 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "com.crsmthw.phase10tracker"
minSdk = 35
targetSdk = 37
versionCode = 5
versionName = "3.0.1"
versionCode = 6
versionName = "3.0.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 5,
"versionName": "3.0.1",
"versionCode": 6,
"versionName": "3.0.2",
"outputFile": "app-release.apk"
}
],
@@ -61,23 +61,24 @@ fun RoundEntryScreen(
},
bottomBar = {
Surface(tonalElevation = 3.dp, shadowElevation = 8.dp) {
Button(
onClick = {
focusManager.clearFocus()
vm.submitRound()
},
enabled = vm.isValid(),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(top = 16.dp, bottom = 16.dp)
.navigationBarsPadding()
.height(56.dp),
shape = MaterialTheme.shapes.large
) {
Icon(Icons.Filled.Check, null)
Spacer(Modifier.width(8.dp))
Text("Submit Round", style = MaterialTheme.typography.titleMedium)
Column(modifier = Modifier.navigationBarsPadding()) {
Button(
onClick = {
focusManager.clearFocus()
vm.submitRound()
},
enabled = vm.isValid(),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(vertical = 16.dp)
.height(56.dp),
shape = MaterialTheme.shapes.large
) {
Icon(Icons.Filled.Check, null)
Spacer(Modifier.width(8.dp))
Text("Submit Round", style = MaterialTheme.typography.titleMedium)
}
}
}
}
@@ -86,7 +87,11 @@ fun RoundEntryScreen(
modifier = Modifier
.fillMaxSize()
.padding(padding)
// This is the key fix: pushes content up when keyboard appears
// Tell Compose the Scaffold padding already consumed those insets,
// so imePadding() only adds the *extra* keyboard space — not the
// full keyboard height on top of the already-padded bottomBar height.
// Without this, the gap = bottomBar height (the double-count).
.consumeWindowInsets(padding)
.imePadding(),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp)