diff --git a/app/build.gradle b/app/build.gradle index 84d17169..f08964f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,7 +81,7 @@ android { resValue "string", "DEFAULT_PROFILE", "profile_8" resValue "string", "applicationId", "org.obd.graphs.my.giulia.aa" applicationId "org.obd.graphs.my.giulia.aa" - versionCode 200 + versionCode 204 } giuliaPerformanceMonitor { diff --git a/app/src/main/java/org/obd/graphs/ui/performance/PerformanceSettings.kt b/app/src/main/java/org/obd/graphs/ui/performance/PerformanceSettings.kt index 85bd1b57..befea207 100644 --- a/app/src/main/java/org/obd/graphs/ui/performance/PerformanceSettings.kt +++ b/app/src/main/java/org/obd/graphs/ui/performance/PerformanceSettings.kt @@ -27,6 +27,7 @@ class PerformanceSettings : ScreenSettings { override fun getPerformanceScreenSettings() = settings.apply { fontSize = Prefs.getS("pref.performance.screen_font_size", "30").toInt() + labelCenterYPadding = Prefs.getS("pref.performance.screen_label_y_padding", "22").toFloat() } override fun isBreakLabelTextEnabled(): Boolean = true diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9dc461f7..c6ff2e51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,9 @@ Open Close + + Gauge label top offset + Please wait. This may take a while.... This is an EXPERIMENTAL feature, controlled by the FF_SWITCH_NETWORK_ENABLED feature flag This is an EXPERIMENTAL feature, controlled by FF_RESULT_CACHE_ENABLED Feature Flag diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index ab922a76..aa774e25 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -729,6 +729,16 @@ app:singleLineTitle="false" app:useSimpleSummaryProvider="true" /> + { - drawGauge(performanceInfoDetails.torque, canvas, rowTop, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = 18f) - drawGauge(performanceInfoDetails.intakePressure, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = 18f) + drawGauge(performanceInfoDetails.torque, canvas, rowTop, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding) + drawGauge(performanceInfoDetails.intakePressure, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding) drawGauge(performanceInfoDetails.gas, canvas, rowTop - 4f, (area.left + area.width() / 2.6f), area.width() / 4.5f) drawGauge(performanceInfoDetails.vehicleSpeed, canvas, rowTop + area.height() / 3f, (area.left + area.width() / 2.65f), area.width() / 4.1f) } 3 -> { - if (drawGauge(performanceInfoDetails.torque, canvas, rowTop, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = 18f)){ + if (drawGauge(performanceInfoDetails.torque, canvas, rowTop, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding)){ drawGauge(performanceInfoDetails.gas, canvas, rowTop - 4f, (area.left + area.width() /2.9f) , area.width() / 3.7f) } else { - drawGauge(performanceInfoDetails.gas, canvas, rowTop - 4f, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = 18f) + drawGauge(performanceInfoDetails.gas, canvas, rowTop - 4f, area.left.toFloat(), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding) } - if (drawGauge(performanceInfoDetails.intakePressure, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = 18f)){ + if (drawGauge(performanceInfoDetails.intakePressure, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding)){ drawGauge(performanceInfoDetails.vehicleSpeed, canvas, rowTop - 4f, (area.left + area.width() / 2.9f) , area.width() / 3.7f) } else { - drawGauge(performanceInfoDetails.vehicleSpeed, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = 18f) + drawGauge(performanceInfoDetails.vehicleSpeed, canvas, rowTop, (area.left + area.width() / 1.65f), area.width() / 2.6f, labelCenterYPadding = labelCenterYPadding) } } @@ -177,13 +178,13 @@ internal class PerformanceDrawer(context: Context, settings: ScreenSettings) : A top: Float, left: Float, width: Float, - labelCenterYPadding: Float = 22f, + labelCenterYPadding: Float = settings.getPerformanceScreenSettings().labelCenterYPadding, ): Boolean = if (metric == null){ false }else { gaugeDrawer.drawGauge( - canvas = canvas, + canvas = canvas, left = left, top = top , width = width,