LunaEvent: rework sleep event

Make the UI more flexible and
slightly easier to understand.

app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt

@@ -506,6 +506,7 @@ class StatisticsActivity : AppCompatActivity() {
             mValuePaint.setColor(color)
             c.drawText(valueText, x.coerceAtLeast(60F), y, mValuePaint)
         }
+
     }
 
     fun showSleepBarGraph(state: GraphState) {
@@ -560,15 +561,12 @@ class StatisticsActivity : AppCompatActivity() {
         }
 
         val set1 = BarDataSet(values, "")
+        val data = BarData(set1)
         set1.setDrawValues(true)
-        set1.setDrawIcons(false)
         set1.isHighlightEnabled = false
 
-        val data = BarData(set1)
-        data.setValueTextSize(12f)
         data.setValueFormatter(object : ValueFormatter() {
             override fun getFormattedValue(value: Float): String {
-
                 val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
                 return when (graphTypeSelection) {
                     GraphType.SLEEP_EVENTS -> {
@@ -585,10 +583,15 @@ class StatisticsActivity : AppCompatActivity() {
             }
         })
 
-        val valueCount = min(values.size, 24)
+        set1.setDrawIcons(false)
-        barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
+
+        data.setValueTextSize(12f)
         barChart.setData(data)
+
+        barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
+
         barChart.legend.isEnabled = false
+        val valueCount = min(values.size, 24)
         barChart.setVisibleXRangeMaximum(valueCount.toFloat())
         barChart.xAxis.setLabelCount(valueCount)
         barChart.xAxis.setCenterAxisLabels(false)
@@ -624,11 +627,11 @@ class StatisticsActivity : AppCompatActivity() {
         }
 
         val set1 = BarDataSet(values, "")
+
         set1.setDrawValues(true)
         set1.isHighlightEnabled = false
-
         val data = BarData(set1)
-        data.setValueTextSize(12f)
+
         data.setValueFormatter(object : ValueFormatter() {
             override fun getFormattedValue(value: Float): String {
                 val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
@@ -648,9 +651,12 @@ class StatisticsActivity : AppCompatActivity() {
             }
         })
 
-        val valueCount = min(values.size, 24)
+        data.setValueTextSize(12f)
-        barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
         barChart.setData(data)
+
+        barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
+
+        val valueCount = min(values.size, 24)
         barChart.setVisibleXRangeMaximum(valueCount.toFloat())
         barChart.xAxis.setLabelCount(valueCount)
         barChart.xAxis.setCenterAxisLabels(false)