forked from penguin86/luna-tracker
Compare commits
5 Commits
e1dbc2c628
...
905aeadabe
| Author | SHA1 | Date | |
|---|---|---|---|
| 905aeadabe | |||
| 2a307fd77c | |||
| 176774352c | |||
| 104bb08134 | |||
| 8684270a22 |
@@ -506,7 +506,6 @@ class StatisticsActivity : AppCompatActivity() {
|
|||||||
mValuePaint.setColor(color)
|
mValuePaint.setColor(color)
|
||||||
c.drawText(valueText, x.coerceAtLeast(60F), y, mValuePaint)
|
c.drawText(valueText, x.coerceAtLeast(60F), y, mValuePaint)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun showSleepBarGraph(state: GraphState) {
|
fun showSleepBarGraph(state: GraphState) {
|
||||||
@@ -561,12 +560,15 @@ class StatisticsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val set1 = BarDataSet(values, "")
|
val set1 = BarDataSet(values, "")
|
||||||
val data = BarData(set1)
|
|
||||||
set1.setDrawValues(true)
|
set1.setDrawValues(true)
|
||||||
|
set1.setDrawIcons(false)
|
||||||
set1.isHighlightEnabled = false
|
set1.isHighlightEnabled = false
|
||||||
|
|
||||||
|
val data = BarData(set1)
|
||||||
|
data.setValueTextSize(12f)
|
||||||
data.setValueFormatter(object : ValueFormatter() {
|
data.setValueFormatter(object : ValueFormatter() {
|
||||||
override fun getFormattedValue(value: Float): String {
|
override fun getFormattedValue(value: Float): String {
|
||||||
|
|
||||||
val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
|
val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
|
||||||
return when (graphTypeSelection) {
|
return when (graphTypeSelection) {
|
||||||
GraphType.SLEEP_EVENTS -> {
|
GraphType.SLEEP_EVENTS -> {
|
||||||
@@ -583,15 +585,10 @@ class StatisticsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
set1.setDrawIcons(false)
|
|
||||||
|
|
||||||
data.setValueTextSize(12f)
|
|
||||||
barChart.setData(data)
|
|
||||||
|
|
||||||
barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
|
|
||||||
|
|
||||||
barChart.legend.isEnabled = false
|
|
||||||
val valueCount = min(values.size, 24)
|
val valueCount = min(values.size, 24)
|
||||||
|
barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
|
||||||
|
barChart.setData(data)
|
||||||
|
barChart.legend.isEnabled = false
|
||||||
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
|
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
|
||||||
barChart.xAxis.setLabelCount(valueCount)
|
barChart.xAxis.setLabelCount(valueCount)
|
||||||
barChart.xAxis.setCenterAxisLabels(false)
|
barChart.xAxis.setCenterAxisLabels(false)
|
||||||
@@ -627,11 +624,11 @@ class StatisticsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val set1 = BarDataSet(values, "")
|
val set1 = BarDataSet(values, "")
|
||||||
|
|
||||||
set1.setDrawValues(true)
|
set1.setDrawValues(true)
|
||||||
set1.isHighlightEnabled = false
|
set1.isHighlightEnabled = false
|
||||||
val data = BarData(set1)
|
|
||||||
|
|
||||||
|
val data = BarData(set1)
|
||||||
|
data.setValueTextSize(12f)
|
||||||
data.setValueFormatter(object : ValueFormatter() {
|
data.setValueFormatter(object : ValueFormatter() {
|
||||||
override fun getFormattedValue(value: Float): String {
|
override fun getFormattedValue(value: Float): String {
|
||||||
val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
|
val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
|
||||||
@@ -651,12 +648,9 @@ class StatisticsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
data.setValueTextSize(12f)
|
|
||||||
barChart.setData(data)
|
|
||||||
|
|
||||||
barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
|
|
||||||
|
|
||||||
val valueCount = min(values.size, 24)
|
val valueCount = min(values.size, 24)
|
||||||
|
barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
|
||||||
|
barChart.setData(data)
|
||||||
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
|
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
|
||||||
barChart.xAxis.setLabelCount(valueCount)
|
barChart.xAxis.setLabelCount(valueCount)
|
||||||
barChart.xAxis.setCenterAxisLabels(false)
|
barChart.xAxis.setCenterAxisLabels(false)
|
||||||
|
|||||||
Reference in New Issue
Block a user