Skip to content

Commit 268c1b4

Browse files
hannesa2hannesa2
authored
Merge pull request #636 from AppDevNext/CodeFormat
Code format
2 parents 42d06c5 + 50c59f1 commit 268c1b4

File tree

103 files changed

+386
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+386
-499
lines changed

‎app/src/androidTest/kotlin/info/appdev/chartexample/PieTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PieTest {
3636
for (x in 10..50 step 10) {
3737
onView(withId(R.id.seekBarX)).perform(setProgress(x))
3838
onView(ViewMatchers.isRoot())
39-
.perform(captureToBitmap { bitmap: Bitmap -> bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}1-${x}")})
39+
.perform(captureToBitmap { bitmap: Bitmap -> bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}1-${x}") })
4040
}
4141

4242
for (x in 50..200 step 50) {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
4+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
55

66
<application
77
android:allowBackup="true"
@@ -16,6 +16,7 @@
1616
<intent-filter>
1717
<action android:name="android.intent.action.MAIN" />
1818
<action android:name="android.intent.action.VIEW" />
19+
1920
<category android:name="android.intent.category.LAUNCHER" />
2021
</intent-filter>
2122
</activity>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import android.widget.SeekBar
1010
import android.widget.SeekBar.OnSeekBarChangeListener
1111
import androidx.core.content.ContextCompat
1212
import androidx.core.net.toUri
13+
import info.appdev.chartexample.DataTools.Companion.getValues
14+
import info.appdev.chartexample.databinding.ActivityBarchartBinding
15+
import info.appdev.chartexample.notimportant.DemoBase
1316
import info.appdev.charting.components.XAxis.XAxisPosition
1417
import info.appdev.charting.data.BarData
1518
import info.appdev.charting.data.BarDataSet
1619
import info.appdev.charting.data.BarEntry
1720
import info.appdev.charting.interfaces.datasets.IBarDataSet
1821
import info.appdev.charting.utils.ColorTemplate
19-
import info.appdev.chartexample.DataTools.Companion.getValues
20-
import info.appdev.chartexample.databinding.ActivityBarchartBinding
21-
import info.appdev.chartexample.notimportant.DemoBase
2222

2323
class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
2424

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ import android.widget.SeekBar.OnSeekBarChangeListener
1212
import androidx.core.content.ContextCompat
1313
import androidx.core.content.res.ResourcesCompat
1414
import androidx.core.net.toUri
15+
import info.appdev.chartexample.DataTools.Companion.getValues
16+
import info.appdev.chartexample.custom.XYMarkerView
17+
import info.appdev.chartexample.databinding.ActivityBarchartBinding
18+
import info.appdev.chartexample.formatter.DayAxisValueFormatter
19+
import info.appdev.chartexample.formatter.MyAxisValueFormatter
20+
import info.appdev.chartexample.notimportant.DemoBase
1521
import info.appdev.charting.components.Legend
1622
import info.appdev.charting.components.Legend.LegendForm
1723
import info.appdev.charting.components.XAxis.XAxisPosition
@@ -27,12 +33,6 @@ import info.appdev.charting.interfaces.datasets.IBarDataSet
2733
import info.appdev.charting.listener.OnChartValueSelectedListener
2834
import info.appdev.charting.utils.Fill
2935
import info.appdev.charting.utils.PointF
30-
import info.appdev.chartexample.DataTools.Companion.getValues
31-
import info.appdev.chartexample.custom.XYMarkerView
32-
import info.appdev.chartexample.databinding.ActivityBarchartBinding
33-
import info.appdev.chartexample.formatter.DayAxisValueFormatter
34-
import info.appdev.chartexample.formatter.MyAxisValueFormatter
35-
import info.appdev.chartexample.notimportant.DemoBase
3636
import timber.log.Timber
3737

3838
class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
@@ -142,7 +142,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
142142
binding.chart1.barData!!.dataSetCount > 0
143143
) {
144144
set1 = binding.chart1.barData!!.getDataSetByIndex(0) as BarDataSet
145-
set1.entries = values
145+
set1.entries = values
146146
binding.chart1.barData?.notifyDataChanged()
147147
binding.chart1.notifyDataSetChanged()
148148
} else {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ 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.custom.MyMarkerView
16+
import info.appdev.chartexample.databinding.ActivityBarchartBinding
17+
import info.appdev.chartexample.notimportant.DemoBase
1418
import info.appdev.charting.components.AxisBase
1519
import info.appdev.charting.components.Legend
1620
import info.appdev.charting.data.BarData
@@ -21,10 +25,6 @@ import info.appdev.charting.formatter.IAxisValueFormatter
2125
import info.appdev.charting.formatter.LargeValueFormatter
2226
import info.appdev.charting.highlight.Highlight
2327
import info.appdev.charting.listener.OnChartValueSelectedListener
24-
import info.appdev.chartexample.DataTools.Companion.getValues
25-
import info.appdev.chartexample.custom.MyMarkerView
26-
import info.appdev.chartexample.databinding.ActivityBarchartBinding
27-
import info.appdev.chartexample.notimportant.DemoBase
2828
import timber.log.Timber
2929
import java.util.Locale
3030

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ 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.databinding.ActivityBarchartSinusBinding
15+
import info.appdev.chartexample.notimportant.DemoBase
1416
import info.appdev.charting.components.Legend
1517
import info.appdev.charting.components.Legend.LegendForm
1618
import info.appdev.charting.data.BarData
1719
import info.appdev.charting.data.BarDataSet
1820
import info.appdev.charting.data.BarEntry
1921
import info.appdev.charting.utils.loadBarEntriesFromAssets
20-
import info.appdev.chartexample.databinding.ActivityBarchartSinusBinding
21-
import info.appdev.chartexample.notimportant.DemoBase
2222

2323
class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
2424

@@ -65,7 +65,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
6565
rightAxis.setDrawGridLines(false)
6666
rightAxis.typeface = tfLight
6767
rightAxis.setLabelCount(6, false)
68-
rightAxis.axisMinimum = -2.5f
68+
rightAxis.axisMinimum = -2.5f
6969
rightAxis.axisMaximum = 2.5f
7070
rightAxis.granularity = 0.1f
7171

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ 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.databinding.ActivityBarchartNoseekbarBinding
10+
import info.appdev.chartexample.notimportant.DemoBase
911
import info.appdev.charting.components.AxisBase
1012
import info.appdev.charting.components.XAxis.XAxisPosition
1113
import info.appdev.charting.data.BarData
@@ -15,8 +17,6 @@ import info.appdev.charting.data.Entry
1517
import info.appdev.charting.formatter.IAxisValueFormatter
1618
import info.appdev.charting.formatter.IValueFormatter
1719
import info.appdev.charting.utils.ViewPortHandler
18-
import info.appdev.chartexample.databinding.ActivityBarchartNoseekbarBinding
19-
import info.appdev.chartexample.notimportant.DemoBase
2020
import java.text.DecimalFormat
2121
import kotlin.math.max
2222
import kotlin.math.min
@@ -109,7 +109,7 @@ class BarChartPositiveNegative : DemoBase() {
109109
binding.chart1.barData!!.dataSetCount > 0
110110
) {
111111
set = binding.chart1.barData!!.getDataSetByIndex(0) as BarDataSet
112-
set.entries = values
112+
set.entries = values
113113
binding.chart1.barData?.notifyDataChanged()
114114
binding.chart1.notifyDataSetChanged()
115115
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import android.widget.SeekBar.OnSeekBarChangeListener
1212
import androidx.core.content.ContextCompat
1313
import androidx.core.content.res.ResourcesCompat
1414
import androidx.core.net.toUri
15+
import info.appdev.chartexample.DataTools.Companion.getValues
16+
import info.appdev.chartexample.databinding.ActivityBubblechartBinding
17+
import info.appdev.chartexample.notimportant.DemoBase
1518
import info.appdev.charting.components.Legend
1619
import info.appdev.charting.components.XAxis
1720
import info.appdev.charting.data.BubbleData
@@ -23,9 +26,6 @@ import info.appdev.charting.interfaces.datasets.IBubbleDataSet
2326
import info.appdev.charting.listener.OnChartValueSelectedListener
2427
import info.appdev.charting.utils.ColorTemplate
2528
import info.appdev.charting.utils.PointF
26-
import info.appdev.chartexample.DataTools.Companion.getValues
27-
import info.appdev.chartexample.databinding.ActivityBubblechartBinding
28-
import info.appdev.chartexample.notimportant.DemoBase
2929
import timber.log.Timber
3030

3131
class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import android.widget.SeekBar.OnSeekBarChangeListener
1313
import androidx.core.content.ContextCompat
1414
import androidx.core.content.res.ResourcesCompat
1515
import androidx.core.net.toUri
16+
import info.appdev.chartexample.DataTools.Companion.getValues
17+
import info.appdev.chartexample.databinding.ActivityCandlechartBinding
18+
import info.appdev.chartexample.notimportant.DemoBase
1619
import info.appdev.charting.components.XAxis.XAxisPosition
1720
import info.appdev.charting.components.YAxis.AxisDependency
1821
import info.appdev.charting.data.CandleData
1922
import info.appdev.charting.data.CandleDataSet
2023
import info.appdev.charting.data.CandleEntry
21-
import info.appdev.chartexample.DataTools.Companion.getValues
22-
import info.appdev.chartexample.databinding.ActivityCandlechartBinding
23-
import info.appdev.chartexample.notimportant.DemoBase
2424

2525
class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
2626

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ 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.ActivityCombinedBinding
11+
import info.appdev.chartexample.notimportant.DemoBase
912
import info.appdev.charting.charts.CombinedChart.DrawOrder
1013
import info.appdev.charting.components.AxisBase
1114
import info.appdev.charting.components.Legend
@@ -28,9 +31,6 @@ import info.appdev.charting.data.ScatterData
2831
import info.appdev.charting.data.ScatterDataSet
2932
import info.appdev.charting.formatter.IAxisValueFormatter
3033
import info.appdev.charting.utils.ColorTemplate
31-
import info.appdev.chartexample.DataTools.Companion.getValues
32-
import info.appdev.chartexample.databinding.ActivityCombinedBinding
33-
import info.appdev.chartexample.notimportant.DemoBase
3434
import kotlin.math.roundToInt
3535

3636
class CombinedChartActivity : DemoBase() {

0 commit comments

Comments
 (0)