Skip to content

fix harcoded altitude units #196

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

Merged
vide merged 2 commits into from
Mar 20, 2026
Merged

fix harcoded altitude units #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e681221
fix harcoded altitude units
MARMdeveloper Mar 7, 2026
c755ef3
fix: correct elevationMin copy-paste bug and restore + prefix on most…
vide Mar 14, 2026
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
29 changes: 29 additions & 0 deletions app/src/main/java/com/matedroid/domain/model/UnitFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,38 @@ import com.matedroid.data.api.models.Units
* IMPORTANT: TeslamateAPI already returns all values pre-converted to the user's preferred
* unit system. Do NOT apply any conversion here — just format the number and attach the
* correct unit label.
*
* Exception: elevation units. We need implement the conversion here until API/Teslamate do itself
*/
object UnitFormatter {

/**
* Format elevation value with appropriate unit label.
* Value is also converted here as the API do not convert to ft when user select mi instead of km.
*/
fun formatElevation(value: Int?, units: Units?): String {
val v = value ?: 0
return if (units?.isImperial == true) {
"%,d ft".format((v * 3.28084).toInt())
} else {
"%,d m".format(v)
}
}

/**
* Get the elevation value
*/
fun getElevationValue(value: Float, units: Units?): Float {
return if (units?.isImperial == true) (value * 3.28084f) else value
}

/**
* Get the elevation unit label
*/
fun getElevationUnit(units: Units?): String {
return if (units?.isImperial == true) "ft" else "m"
}

/**
* Format distance value with appropriate unit label.
* Value is already in km (metric) or mi (imperial) as returned by the API.
Expand Down
19 changes: 4 additions & 15 deletions app/src/main/java/com/matedroid/ui/screens/dashboard/DashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ import com.matedroid.data.api.models.CarExterior
import com.matedroid.data.api.models.CarGeodata
import com.matedroid.data.api.models.CarStatus
import com.matedroid.domain.model.CarImageResolver
import com.matedroid.domain.model.UnitFormatter
import com.matedroid.data.api.models.CarStatusDetails
import com.matedroid.data.api.models.Units
import com.matedroid.domain.model.UnitFormatter
import com.matedroid.data.api.models.CarVersions
import com.matedroid.data.api.models.ChargingDetails
import com.matedroid.data.api.models.TpmsDetails
Expand Down Expand Up @@ -1544,17 +1544,6 @@ private fun LocationCard(status: CarStatus, units: Units?, resolvedAddress: Stri
}
}

// Format elevation with unit conversion
val elevationText = elevation?.let {
val isImperial = units?.unitOfLength == "mi"
if (isImperial) {
val feet = (it * 3.28084).toInt()
"%,d ft".format(feet)
} else {
"%,d m".format(it)
}
}

fun openInMaps() {
if (latitude != null && longitude != null) {
val geoUri = Uri.parse("geo:$latitude,$longitude?q=$latitude,$longitude")
Expand Down Expand Up @@ -1615,13 +1604,13 @@ private fun LocationCard(status: CarStatus, units: Units?, resolvedAddress: Stri
}

// Elevation row - icon aligned with location icon, text aligned with location text
if (elevationText != null) {
if (elevation != null) {
Spacer(modifier = Modifier.height(8.dp))
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
imageVector = Icons.Filled.Terrain,
contentDescription = null,
tint = palette.onSurfaceVariant
tint = palette.accent
)
Spacer(modifier = Modifier.width(12.dp))
Text(
Expand All @@ -1631,7 +1620,7 @@ private fun LocationCard(status: CarStatus, units: Units?, resolvedAddress: Stri
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = elevationText,
text = UnitFormatter.formatElevation(elevation, units),
style = MaterialTheme.typography.bodyMedium,
color = palette.onSurface,
maxLines = 1,
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/java/com/matedroid/ui/screens/drives/DriveDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,10 @@ private fun DriveDetailContent(
title = stringResource(R.string.elevation),
icon = Icons.Default.Landscape,
stats = listOf(
StatItem(stringResource(R.string.maximum), "%,d m".format(s.elevationMax)),
StatItem(stringResource(R.string.minimum), "%,d m".format(s.elevationMin)),
StatItem(stringResource(R.string.gain), "+%,d m".format(s.elevationGain)),
StatItem(stringResource(R.string.loss), "-%,d m".format(s.elevationLoss))
StatItem(stringResource(R.string.maximum), UnitFormatter.formatElevation(s.elevationMax, units)),
StatItem(stringResource(R.string.minimum), UnitFormatter.formatElevation(s.elevationMin, units)),
StatItem(stringResource(R.string.gain), "+" + UnitFormatter.formatElevation(s.elevationGain, units)),
StatItem(stringResource(R.string.loss), "-" + UnitFormatter.formatElevation(s.elevationLoss, units)),
)
)
}
Expand Down Expand Up @@ -312,6 +312,7 @@ private fun DriveDetailContent(
if (detail.positions.any { it.elevation != null && it.elevation != 0 }) {
ElevationChartCard(
positions = detail.positions,
units = units,
timeLabels = timeLabels,
externalSelectedFraction = sharedXFraction,
onXSelected = { sharedXFraction = it },
Expand Down Expand Up @@ -745,6 +746,7 @@ private fun BatteryChartCard(
@Composable
private fun ElevationChartCard(
positions: List<DrivePosition>,
units: Units?,
timeLabels: List<String>,
externalSelectedFraction: Float? = null,
onXSelected: ((Float?) -> Unit)? = null,
Expand All @@ -758,11 +760,12 @@ private fun ElevationChartCard(
icon = Icons.Default.Landscape,
data = elevations,
color = Color(0xFF8B4513), // Brown color for terrain
unit = "m",
unit = UnitFormatter.getElevationUnit(units),
timeLabels = timeLabels,
externalSelectedFraction = externalSelectedFraction,
onXSelected = onXSelected,
fractionToTimeLabel = fractionToTimeLabel
fractionToTimeLabel = fractionToTimeLabel,
convertValue = { UnitFormatter.getElevationValue(it, units) }
)
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/matedroid/ui/screens/stats/StatsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,10 +844,10 @@ private fun RecordsCard(
// Category 3: Weather & Altitude
val weatherRecords = mutableListOf<RecordData>()
deepStats?.driveWithMaxElevation?.let { record ->
weatherRecords.add(RecordData("🏔️", labelHighestPoint, "%,d m".format(record.elevationM), record.date?.take(10) ?: "") { onDriveClick(record.driveId) })
weatherRecords.add(RecordData("🏔️", labelHighestPoint, UnitFormatter.formatElevation(record.elevationM, units), record.date?.take(10) ?: "") { onDriveClick(record.driveId) })
}
deepStats?.driveWithMostClimbing?.let { record ->
weatherRecords.add(RecordData("⛰️", labelMostClimbing, record.elevationGainM?.let { "+%,d m".format(it) } ?: "N/A", record.date?.take(10) ?: "") { onDriveClick(record.driveId) })
weatherRecords.add(RecordData("⛰️", labelMostClimbing, record.elevationGainM?.let { "+" + UnitFormatter.formatElevation(it, units) } ?: "N/A", record.date?.take(10) ?: "") { onDriveClick(record.driveId) })
}
deepStats?.hottestDrive?.let { record ->
weatherRecords.add(RecordData("🌡️", labelHottestDrive, UnitFormatter.formatTemperature(record.tempC, units, 1), record.date?.take(10) ?: "") { onDriveClick(record.driveId) })
Expand Down
Loading