Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="nav_open">Open</string>
<string name="nav_close">Close</string>

<string name="pref.performance.screen_label_y_padding"><b><i>Gauge</i></b> label top offset</string>

<string name="dialog.screen.lock.message">Please wait. This may take a while....</string>
<string name="pref.experimental_switch_network_enabled">This is an EXPERIMENTAL feature, controlled by the FF_SWITCH_NETWORK_ENABLED feature flag</string>
<string name="pref.experimental_result_cache_enabled">This is an EXPERIMENTAL feature, controlled by FF_RESULT_CACHE_ENABLED Feature Flag</string>
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/xml/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,16 @@
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<org.obd.graphs.preferences.components.ExtendedSeekBar
android:defaultValue="22"
android:dialogTitle="@string/pref.performance.screen_label_y_padding"
android:key="pref.performance.screen_label_y_padding"
android:max="30"
android:title="@string/pref.performance.screen_label_y_padding"
app:min="-100"
app:showSeekBarValue="true"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />
</PreferenceScreen>

<PreferenceScreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ data class BreakBoostingSettings(
)

data class PerformanceScreenSettings(
var labelCenterYPadding:Float = 22f,
var fontSize: Int = 24,
var viewEnabled: Boolean = true,
var breakBoostingSettings: BreakBoostingSettings = BreakBoostingSettings()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.graphics.Paint
import android.graphics.Rect
import android.graphics.RectF
import android.graphics.SweepGradient
import android.util.Log
import org.obd.graphs.bl.collector.Metric
import org.obd.graphs.commons.R
import org.obd.graphs.format
Expand Down Expand Up @@ -302,6 +303,8 @@ internal class GaugeDrawer(

var centerY =
(area.centerY() + labelCenterYPadding - (if (settings.isStatisticsEnabled()) 8 else 1) * scaleRationBasedOnScreenSize(area))
Log.e("WWWWWWWWWw","centerY = $centerY ")

val valueHeight = max(textRect.height(), MIN_TEXT_VALUE_HEIGHT) + settings.getGaugeRendererSetting().topOffset
val valueY = centerY - valueHeight
canvas.drawText(value, area.centerX() - (textRect.width() / 2), valueY, valuePaint)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package org.obd.graphs.renderer.performance

import android.content.Context
import android.graphics.*
import android.util.Log
import org.obd.graphs.bl.collector.Metric
import org.obd.graphs.renderer.AbstractDrawer
import org.obd.graphs.renderer.GaugeProgressBarType
Expand Down Expand Up @@ -99,25 +100,25 @@ internal class PerformanceDrawer(context: Context, settings: ScreenSettings) : A
if (performanceInfoDetails.torque == null) numGauges--
if (performanceInfoDetails.intakePressure == null) numGauges--


val labelCenterYPadding = settings.getPerformanceScreenSettings().labelCenterYPadding - 4

when (numGauges) {
4 ->{
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)
}
}

Expand Down Expand Up @@ -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,
Expand Down
Loading