feat: AA: Conditionally draw background

tzebrowski · Sep 6, 2023 · b651a52 · b651a52
1 parent 7dd7b83
commit b651a52
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -137,6 +137,8 @@
     <string name="pref.aa.alerting.legend.enabled">Enable Alerting Legend</string>
     <string name="pref.aa.alerting.legend.enabled_summary">When enabled, rules for alerting are displayed on the screen if available for given PID: ENGINE_TEMP > 110</string>
 
+    <string name="pref.aa.theme.background.enabled">Background enabled</string>
+
     <string name="pref.aa.theme.dynamic_selector.enabled">Dynamic selector enabled</string>
     <string name="pref.aa.theme.dynamic_selector.enabled_summary">When enabled, colors are applied based on selected dynamic mode: SPORT,NORMAL,ECO</string>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -916,6 +916,12 @@
                 </PreferenceCategory>
 
                 <PreferenceCategory android:title="@string/pref.theme">
+                    <CheckBoxPreference
+                        app:singleLineTitle="false"
+                        android:defaultValue="true"
+                        android:key="pref.aa.theme.background.enabled"
+                        android:title="@string/pref.aa.theme.background.enabled" />
+
                     <CheckBoxPreference
                         app:singleLineTitle="false"
                         android:defaultValue="false"

diff --git a/automotive/src/main/java/org/obd/graphs/aa/CarSettings.kt b/automotive/src/main/java/org/obd/graphs/aa/CarSettings.kt
@@ -16,6 +16,8 @@ private const val PREF_PIDS_HISTORY_ENABLED= "pref.aa.pids.history.enabled"
 private const val PREF_THEME_IN_ALLERT_VALUE_COLOR= "pref.aa.theme.inAlertValueColor"
 private const val PREF_DYNAMIC_SELECTOR_ENABLED= "pref.aa.theme.dynamic-selector.enabled"
 
+private const val BACKGROUND_ENABLED= "pref.aa.theme.background.enabled"
+
 private const val PREF_ALERT_LEGEND_ENABLED= "pref.aa.alerting.legend.enabled"
 private const val PREF_ALERTING_ENABLED= "pref.aa.alerting.enabled"
 private const val PREF_THEME_PROGRESS_BAR_COLOR= "pref.aa.theme.progressColor"
@@ -77,6 +79,8 @@ internal class CarSettings : ScreenSettings {
         }
     }
 
+    override fun isBackgroundDrawingEnabled(): Boolean  = Prefs.getBoolean(BACKGROUND_ENABLED, true)
+
     override fun isDynamicSelectorThemeEnabled(): Boolean =  Prefs.getBoolean(PREF_DYNAMIC_SELECTOR_ENABLED, false)
 
     override fun isAlertingEnabled(): Boolean = Prefs.getBoolean(PREF_ALERTING_ENABLED, false)

diff --git a/giulia_renderer/src/main/java/org/obd/graphs/renderer/DrawingManager.kt b/giulia_renderer/src/main/java/org/obd/graphs/renderer/DrawingManager.kt
@@ -64,7 +64,9 @@ internal class DrawingManager(context: Context,  private val settings: ScreenSet
         canvas?.let {
             it.drawRect(area, paint)
             it.drawColor(Color.BLACK)
-            it.drawBitmap(background, area.left.toFloat(), area.top.toFloat(), backgroundPaint)
+            if (settings.isBackgroundDrawingEnabled()) {
+                it.drawBitmap(background, area.left.toFloat(), area.top.toFloat(), backgroundPaint)
+            }
         }
     }
 

diff --git a/giulia_renderer/src/main/java/org/obd/graphs/renderer/ScreenSettings.kt b/giulia_renderer/src/main/java/org/obd/graphs/renderer/ScreenSettings.kt
@@ -24,6 +24,9 @@ interface ScreenSettings {
 
     fun dynamicSelectorChangedEvent(mode: DynamicSelectorMode){}
 
+
+    fun isBackgroundDrawingEnabled (): Boolean = true
+
     fun isDynamicSelectorThemeEnabled (): Boolean = false
 
     fun isAlertLegendEnabled (): Boolean = false

diff --git a/giulia_renderer/src/main/java/org/obd/graphs/renderer/SimpleScreenRenderer.kt b/giulia_renderer/src/main/java/org/obd/graphs/renderer/SimpleScreenRenderer.kt
@@ -19,7 +19,6 @@ internal class SimpleScreenRenderer(
 ) : ScreenRenderer {
 
     private val drawingManager = DrawingManager(context, settings)
-
     override fun onDraw(canvas: Canvas, visibleArea: Rect?) {
 
         visibleArea?.let { area ->
@@ -37,6 +36,7 @@ internal class SimpleScreenRenderer(
             val textSize = textHeight - ROW_SPACING
 
             drawingManager.drawBackground(area)
+
             var verticalPos = area.top + textHeight.toFloat() / 2
 
             if (settings.isStatusPanelEnabled()) {