yan/archived-matedroid
1
0
Fork 0
mirror of https://github.com/vide/matedroid.git synced 2026-01-20 00:03:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: position tires inside car body outline

Browse Source 
Tires are now drawn inside the car rectangle at the corners,
like real wheel wells. Car body is now a stroke outline so
the colored tires are visible inside it.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Davide Ferrari
2025-12-21 17:44:42 +01:00
co-authored by Claude Opus 4.5
parent f60b59b4a2
commit f6d82c3ba4
1 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/matedroid/ui/screens/dashboard/DashboardScreen.kt
+58 -41
View File
@@ -946,56 +946,73 @@ private fun TirePressureDisplay(
// Car top-down view with tires
Canvas(
modifier = Modifier
.width(50.dp)
.height(90.dp)
.width(60.dp)
.height(100.dp)
) {
val carWidth = size.width * 0.6f
val carHeight = size.height * 0.85f
val carWidth = size.width * 0.65f
val carHeight = size.height * 0.9f
val carLeft = (size.width - carWidth) / 2
val carTop = (size.height - carHeight) / 2
val tireWidth = size.width * 0.18f
val tireHeight = size.height * 0.22f
val tireCornerRadius = androidx.compose.ui.geometry.CornerRadius(4.dp.toPx())
val tireWidth = size.width * 0.15f
val tireHeight = size.height * 0.18f
val tireCornerRadius = androidx.compose.ui.geometry.CornerRadius(3.dp.toPx())
// Draw car body (rounded rectangle)
// Tire inset from car edges
val tireInsetX = carWidth * 0.08f
val tireInsetY = carHeight * 0.08f
// Front left tire (inside car body at top-left corner)
drawRoundRect(
color = flColor,
topLeft = androidx.compose.ui.geometry.Offset(
carLeft + tireInsetX,
carTop + tireInsetY
),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Front right tire (inside car body at top-right corner)
drawRoundRect(
color = frColor,
topLeft = androidx.compose.ui.geometry.Offset(
carLeft + carWidth - tireWidth - tireInsetX,
carTop + tireInsetY
),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Rear left tire (inside car body at bottom-left corner)
drawRoundRect(
color = rlColor,
topLeft = androidx.compose.ui.geometry.Offset(
carLeft + tireInsetX,
carTop + carHeight - tireHeight - tireInsetY
),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Rear right tire (inside car body at bottom-right corner)
drawRoundRect(
color = rrColor,
topLeft = androidx.compose.ui.geometry.Offset(
carLeft + carWidth - tireWidth - tireInsetX,
carTop + carHeight - tireHeight - tireInsetY
),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Draw car body (rounded rectangle) - drawn last so it's on top
drawRoundRect(
color = carBodyColor,
topLeft = androidx.compose.ui.geometry.Offset(carLeft, carTop),
size = androidx.compose.ui.geometry.Size(carWidth, carHeight),
cornerRadius = androidx.compose.ui.geometry.CornerRadius(8.dp.toPx())
)
// Front left tire
drawRoundRect(
color = flColor,
topLeft = androidx.compose.ui.geometry.Offset(0f, carTop - tireHeight * 0.3f),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Front right tire
drawRoundRect(
color = frColor,
topLeft = androidx.compose.ui.geometry.Offset(size.width - tireWidth, carTop - tireHeight * 0.3f),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Rear left tire
drawRoundRect(
color = rlColor,
topLeft = androidx.compose.ui.geometry.Offset(0f, carTop + carHeight - tireHeight * 0.7f),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
)
// Rear right tire
drawRoundRect(
color = rrColor,
topLeft = androidx.compose.ui.geometry.Offset(size.width - tireWidth, carTop + carHeight - tireHeight * 0.7f),
size = androidx.compose.ui.geometry.Size(tireWidth, tireHeight),
cornerRadius = tireCornerRadius
cornerRadius = androidx.compose.ui.geometry.CornerRadius(10.dp.toPx()),
style = androidx.compose.ui.graphics.drawscope.Stroke(width = 2.dp.toPx())
)
}