crsmthw/Phase10-Tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

minor bugfix

Browse Source
This commit is contained in:
Cris Mathew
2026-05-17 11:12:36 +03:00
parent 84567bebaa
commit 3637a1e236
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+2 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "com.crsmthw.phase10tracker" applicationId = "com.crsmthw.phase10tracker"
minSdk = 35 minSdk = 35
targetSdk = 37 targetSdk = 37
versionCode = 5 versionCode = 6
versionName = "3.0.1" versionName = "3.0.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
app/release/baselineProfiles/0/app-release.dm
BIN
View File
Binary file not shown.
app/release/baselineProfiles/1/app-release.dm
BIN
View File
Binary file not shown.
app/release/output-metadata.json
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 5, "versionCode": 6,
"versionName": "3.0.1", "versionName": "3.0.2",
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }
], ],
app/src/main/java/com/crsmthw/phase10tracker/ui/screens/RoundEntryScreen.kt
+23 -18
View File
@@ -61,23 +61,24 @@ fun RoundEntryScreen(
}, },
bottomBar = { bottomBar = {
Surface(tonalElevation = 3.dp, shadowElevation = 8.dp) { Surface(tonalElevation = 3.dp, shadowElevation = 8.dp) {
Button( Column(modifier = Modifier.navigationBarsPadding()) {
onClick = { Button(
focusManager.clearFocus() onClick = {
vm.submitRound() focusManager.clearFocus()
}, vm.submitRound()
enabled = vm.isValid(), },
modifier = Modifier enabled = vm.isValid(),
.fillMaxWidth() modifier = Modifier
.padding(horizontal = 16.dp) .fillMaxWidth()
.padding(top = 16.dp, bottom = 16.dp) .padding(horizontal = 16.dp)
.navigationBarsPadding() .padding(vertical = 16.dp)
.height(56.dp), .height(56.dp),
shape = MaterialTheme.shapes.large shape = MaterialTheme.shapes.large
) { ) {
Icon(Icons.Filled.Check, null) Icon(Icons.Filled.Check, null)
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text("Submit Round", style = MaterialTheme.typography.titleMedium) Text("Submit Round", style = MaterialTheme.typography.titleMedium)
}
} }
} }
} }
@@ -86,7 +87,11 @@ fun RoundEntryScreen(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(padding) .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(), .imePadding(),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 12.dp), contentPadding = PaddingValues(horizontal = 16.dp, vertical = 12.dp),
verticalArrangement = Arrangement.spacedBy(12.dp) verticalArrangement = Arrangement.spacedBy(12.dp)