Improve behavior of CartesianLayer#updateChartValues implementations

patrykandpatrick · Dec 14, 2023 · 25a269c · 25a269c
1 parent 4a97909
commit 25a269c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/ColumnCartesianLayer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/ColumnCartesianLayer.kt
@@ -350,8 +350,10 @@ public open class ColumnCartesianLayer(
             axisPosition = verticalAxisPosition,
             minX = axisValueOverrider?.getMinX(model) ?: model.minX,
             maxX = axisValueOverrider?.getMaxX(model) ?: model.maxX,
-            minY = axisValueOverrider?.getMinY(model) ?: mergeMode.getMinY(model),
-            maxY = axisValueOverrider?.getMaxY(model) ?: mergeMode.getMaxY(model),
+            minY = axisValueOverrider?.getMinY(model) ?: mergeMode.getMinY(model).coerceAtMost(0f),
+            maxY =
+                axisValueOverrider?.getMaxY(model)
+                    ?: if (model.minY == 0f && model.maxY == 0f) 1f else mergeMode.getMaxY(model).coerceAtLeast(0f),
         )
     }
 
@@ -446,8 +448,8 @@ public open class ColumnCartesianLayer(
          */
         public fun getMinY(model: ColumnCartesianLayerModel): Float =
             when (this) {
-                Grouped -> model.minY.coerceAtMost(0f)
-                Stacked -> model.minAggregateY.coerceAtMost(0f)
+                Grouped -> model.minY
+                Stacked -> model.minAggregateY
             }
 
         /**

diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayer.kt
@@ -567,8 +567,10 @@ public open class LineCartesianLayer(
         chartValues.tryUpdate(
             minX = axisValueOverrider?.getMinX(model) ?: model.minX,
             maxX = axisValueOverrider?.getMaxX(model) ?: model.maxX,
-            minY = axisValueOverrider?.getMinY(model) ?: min(model.minY, 0f),
-            maxY = axisValueOverrider?.getMaxY(model) ?: model.maxY,
+            minY = axisValueOverrider?.getMinY(model) ?: model.minY.coerceAtMost(0f),
+            maxY =
+                axisValueOverrider?.getMaxY(model)
+                    ?: if (model.minY == 0f && model.maxY == 0f) 1f else model.maxY.coerceAtLeast(0f),
             axisPosition = verticalAxisPosition,
         )
     }