diff --git a/core/assets/test/components/BarChart/2-series.png b/core/assets/test/components/BarChart/2-series.png index 0dcdb126a..833e4b19c 100644 Binary files a/core/assets/test/components/BarChart/2-series.png and b/core/assets/test/components/BarChart/2-series.png differ diff --git a/core/assets/test/components/BarChart/axis-monthly.png b/core/assets/test/components/BarChart/axis-monthly.png index 3a8633ec2..1313b4f94 100644 Binary files a/core/assets/test/components/BarChart/axis-monthly.png and b/core/assets/test/components/BarChart/axis-monthly.png differ diff --git a/core/assets/test/components/BarChart/axis-weekly.png b/core/assets/test/components/BarChart/axis-weekly.png index 132cfce63..330923a42 100644 Binary files a/core/assets/test/components/BarChart/axis-weekly.png and b/core/assets/test/components/BarChart/axis-weekly.png differ diff --git a/core/assets/test/components/BarChart/axis-yearly.png b/core/assets/test/components/BarChart/axis-yearly.png index 39ac4c552..ec97df8a1 100644 Binary files a/core/assets/test/components/BarChart/axis-yearly.png and b/core/assets/test/components/BarChart/axis-yearly.png differ diff --git a/core/assets/test/components/BarChart/base.png b/core/assets/test/components/BarChart/base.png index 8d917b769..54d6862d7 100644 Binary files a/core/assets/test/components/BarChart/base.png and b/core/assets/test/components/BarChart/base.png differ diff --git a/core/src/main/common/org/isoron/uhabits/components/BarChart.kt b/core/src/main/common/org/isoron/uhabits/components/BarChart.kt index c687e1ba6..ba3f631a2 100644 --- a/core/src/main/common/org/isoron/uhabits/components/BarChart.kt +++ b/core/src/main/common/org/isoron/uhabits/components/BarChart.kt @@ -59,7 +59,7 @@ class BarChart(var theme: Theme, canvas.fillRect(0.0, 0.0, width, height) fun barGroupOffset(c: Int) = marginLeft + paddingLeft + - (nColumns - c - 1) * barGroupWidth + (c) * barGroupWidth fun barOffset(c: Int, s: Int) = barGroupOffset(c) + barGroupMargin + @@ -130,8 +130,8 @@ class BarChart(var theme: Theme, val isLargeInterval = (axis[0].distanceTo(axis[1]) > 300) for (c in 0 until nColumns) { - val x = barGroupOffset(nColumns - c - 1) - val date = axis[nColumns - c - 1] + val x = barGroupOffset(c) + val date = axis[c] if(isLargeInterval) { canvas.drawText(date.year.toString(), x + barGroupWidth / 2,