Skip to content

Commit e30a9f0

Browse files
hannesa2hannesa2
committed
Cosmetic
1 parent b3beb0e commit e30a9f0

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,31 +67,34 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
6767
// chart.setDrawYLabels(false);
6868
val xAxisFormatter: IAxisValueFormatter = DayAxisValueFormatter(binding.chart1)
6969

70-
val xAxis = binding.chart1.xAxis
71-
xAxis.position = XAxisPosition.BOTTOM
72-
xAxis.typeface = tfLight
73-
xAxis.setDrawGridLines(false)
74-
xAxis.granularity = 1f // only intervals of 1 day
75-
xAxis.labelCount = 7
76-
xAxis.valueFormatter = xAxisFormatter
70+
binding.chart1.xAxis.apply {
71+
position = XAxisPosition.BOTTOM
72+
typeface = tfLight
73+
setDrawGridLines(false)
74+
granularity = 1f // only intervals of 1 day
75+
labelCount = 7
76+
valueFormatter = xAxisFormatter
77+
}
7778

7879
val custom: IAxisValueFormatter = MyAxisValueFormatter()
7980

80-
val leftAxis = binding.chart1.axisLeft
81-
leftAxis.typeface = tfLight
82-
leftAxis.setLabelCount(8, false)
83-
leftAxis.valueFormatter = custom
84-
leftAxis.setPosition(YAxisLabelPosition.OUTSIDE_CHART)
85-
leftAxis.spaceTop = 15f
86-
leftAxis.axisMinimum = 0f// this replaces setStartAtZero(true)
87-
88-
val rightAxis = binding.chart1.axisRight
89-
rightAxis.setDrawGridLines(false)
90-
rightAxis.typeface = tfLight
91-
rightAxis.setLabelCount(8, false)
92-
rightAxis.valueFormatter = custom
93-
rightAxis.spaceTop = 15f
94-
rightAxis.axisMinimum = 0f// this replaces setStartAtZero(true)
81+
binding.chart1.axisLeft.apply {
82+
typeface = tfLight
83+
setLabelCount(8, false)
84+
valueFormatter = custom
85+
spaceTop = 15f
86+
axisMinimum = 0f// this replaces setStartAtZero(true)
87+
setPosition(YAxisLabelPosition.OUTSIDE_CHART)
88+
}
89+
90+
binding.chart1.axisRight.apply {
91+
setDrawGridLines(false)
92+
typeface = tfLight
93+
setLabelCount(8, false)
94+
valueFormatter = custom
95+
spaceTop = 15f
96+
axisMinimum = 0f// this replaces setStartAtZero(true)
97+
}
9598

9699
binding.chart1.legend.apply {
97100
verticalAlignment = Legend.LegendVerticalAlignment.BOTTOM

‎app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import android.widget.SeekBar
1212
import android.widget.SeekBar.OnSeekBarChangeListener
1313
import androidx.core.content.ContextCompat
1414
import androidx.core.net.toUri
15+
import info.appdev.chartexample.DataTools.Companion.getMuchValues
16+
import info.appdev.chartexample.databinding.ActivityLinechartBinding
17+
import info.appdev.chartexample.notimportant.DemoBase
1518
import info.appdev.charting.components.YAxis
1619
import info.appdev.charting.data.Entry
1720
import info.appdev.charting.data.LineData
1821
import info.appdev.charting.data.LineDataSet
1922
import info.appdev.charting.formatter.IFillFormatter
2023
import info.appdev.charting.interfaces.dataprovider.LineDataProvider
2124
import info.appdev.charting.interfaces.datasets.ILineDataSet
22-
import info.appdev.chartexample.DataTools.Companion.getMuchValues
23-
import info.appdev.chartexample.databinding.ActivityLinechartBinding
24-
import info.appdev.chartexample.notimportant.DemoBase
2525

2626
class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
2727

@@ -93,8 +93,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
9393

9494
val set1: LineDataSet
9595

96-
if (binding.chart1.lineData.dataSetCount > 0
97-
) {
96+
if (binding.chart1.lineData.dataSetCount > 0) {
9897
set1 = binding.chart1.lineData.getDataSetByIndex(0) as LineDataSet
9998
set1.entries = values
10099
binding.chart1.lineData.notifyDataChanged()

‎app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import android.os.Bundle
66
import android.view.Menu
77
import android.view.MenuItem
88
import androidx.core.net.toUri
9+
import info.appdev.chartexample.DataTools.Companion.getValues
10+
import info.appdev.chartexample.databinding.ActivityLinechartNoseekbarBinding
11+
import info.appdev.chartexample.notimportant.DemoBase
912
import info.appdev.charting.components.YAxis
1013
import info.appdev.charting.data.Entry
1114
import info.appdev.charting.data.LineData
1215
import info.appdev.charting.data.LineDataSet
1316
import info.appdev.charting.formatter.IFillFormatter
1417
import info.appdev.charting.interfaces.dataprovider.LineDataProvider
1518
import info.appdev.charting.interfaces.datasets.ILineDataSet
16-
import info.appdev.chartexample.DataTools.Companion.getValues
17-
import info.appdev.chartexample.databinding.ActivityLinechartNoseekbarBinding
18-
import info.appdev.chartexample.notimportant.DemoBase
1919

2020
/**
2121
* This works by inverting the background and desired "fill" color. First, we draw the fill color
@@ -87,8 +87,7 @@ class FilledLineActivity : DemoBase() {
8787
val set1: LineDataSet
8888
val set2: LineDataSet
8989

90-
if (binding.chart1.lineData.dataSetCount > 0
91-
) {
90+
if (binding.chart1.lineData.dataSetCount > 0) {
9291
set1 = binding.chart1.lineData.getDataSetByIndex(0) as LineDataSet
9392
set2 = binding.chart1.lineData.getDataSetByIndex(1) as LineDataSet
9493
set1.entries = valuesArray1

‎app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import android.widget.SeekBar
1111
import android.widget.SeekBar.OnSeekBarChangeListener
1212
import androidx.core.content.ContextCompat
1313
import androidx.core.net.toUri
14+
import info.appdev.chartexample.DataTools.Companion.getValues
15+
import info.appdev.chartexample.databinding.ActivityLinechartBinding
16+
import info.appdev.chartexample.notimportant.DemoBase
1417
import info.appdev.charting.charts.LineChart
1518
import info.appdev.charting.components.Legend
1619
import info.appdev.charting.components.Legend.LegendForm
@@ -21,9 +24,6 @@ import info.appdev.charting.data.LineDataSet
2124
import info.appdev.charting.highlight.Highlight
2225
import info.appdev.charting.listener.OnChartValueSelectedListener
2326
import info.appdev.charting.utils.ColorTemplate
24-
import info.appdev.chartexample.DataTools.Companion.getValues
25-
import info.appdev.chartexample.databinding.ActivityLinechartBinding
26-
import info.appdev.chartexample.notimportant.DemoBase
2727
import timber.log.Timber
2828

2929
/**
@@ -137,8 +137,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
137137
val set2: LineDataSet
138138
val set3: LineDataSet
139139

140-
if (binding.chart1.lineData.dataSetCount > 0
141-
) {
140+
if (binding.chart1.lineData.dataSetCount > 0) {
142141
set1 = binding.chart1.lineData.getDataSetByIndex(0) as LineDataSet
143142
set2 = binding.chart1.lineData.getDataSetByIndex(1) as LineDataSet
144143
set3 = binding.chart1.lineData.getDataSetByIndex(2) as LineDataSet

‎chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,18 +453,18 @@ abstract class AxisBase : ComponentBase() {
453453
this.isDrawGridLinesBehindDataEnabled = enabled
454454
}
455455

456+
/**
457+
* Returns the longest formatted label (in terms of characters), this axis contains.
458+
*/
456459
val longestLabel: String
457-
/**
458-
* Returns the longest formatted label (in terms of characters), this axis
459-
* contains.
460-
*/
461460
get() {
462461
var longest: String? = ""
463462

464463
for (i in entries.indices) {
465464
val text = getFormattedLabel(i)
466465

467-
if (text != null && longest!!.length < text.length) longest = text
466+
if (text != null && longest!!.length < text.length)
467+
longest = text
468468
}
469469

470470
return longest!!

0 commit comments

Comments
 (0)