Skip to content

Commit 1083827

Browse files
committed
Simplify months code
1 parent 3514afa commit 1083827

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/CombinedChartActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
8787
xAxis.setValueFormatter(new IAxisValueFormatter() {
8888
@Override
8989
public String getFormattedValue(float value, AxisBase axis) {
90-
return months[(int) value % months.length];
90+
return DemoBase.Companion.getMonths().get((int) value % DemoBase.Companion.getMonths().size());
9191
}
9292
});
9393

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/notimportant/DemoBase.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ import androidx.core.app.ActivityCompat
1111
import com.github.mikephil.charting.charts.Chart
1212
import com.google.android.material.snackbar.Snackbar
1313
import com.xxmassdeveloper.mpchartexample.R
14+
import java.text.DateFormatSymbols
1415

1516
abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissionsResultCallback {
16-
@JvmField
17-
protected val months: Array<String> = arrayOf(
18-
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"
19-
)
2017

2118
@JvmField
2219
protected val parties: Array<String> = arrayOf(
@@ -85,5 +82,7 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
8582

8683
companion object {
8784
private const val PERMISSION_STORAGE = 0
85+
// Jan, Feb,... Dec
86+
val months = DateFormatSymbols().months.toList().map { it.take(3) }
8887
}
8988
}

0 commit comments

Comments
 (0)